Completes addition of basic code - still unit tests and examples to add