First commit with much working