All tests working. Now adding missing tests.
Code as of Friday