Version 1

Add tests
Clear up backlog code