Initial commit of the current progress on the project