First commit of working prototype