updated to first functional version

- no tests for now