Prob 3 progress

Restructured code, omitted superfluous stuff