Made the initial test pass
WIP