commited first wip version