Final commit

Passes unit tests