WIP

Unit tests added to everything else