Completion of 1A

We fixed various errors including memory issue and issues with how our
architecture was set up.