WIP and adding unit tests