Adam - Incremental update, post Rory's push.

04/06/2014 - Working on merging my code with Rory's in order to get a
working prototype for Quest.