More progress, first unit tests yay