WIP - get tests passing