WIP - 4 tests working by now