Initial Project Commit - Current State 14-10-2014