Work In-Progress.....line 31