moving to other branch
Lines 94 and 90 in davids' test left for fixing
Finnished but for declarations