WIP with first tests