12/02/2014 - Made progress in main code, pushing to master

Pushing code to master.