Format code
Add TODO statements for remaining work
Added basic unit test setup