WIP clearly, start writing tests

Alright I'll keep it around for the moment then