Working code for A3

Has some temp code to make it work properly, should be cleaned up later.
But can now use the assignments questions as a base to test if changes
break it