Updates and some tests (wip)