Last finishing touches on code base