First commit of slightly working code