First commit of project and some other minor changes