First commit with all the work that has been completed so far