Got tests passing & added some more