WIP clearly, start writing tests