Scaffold of Proposal done, trying to make tests work