Commit basic project as of 14/06/13