added some namespacing and started unit testing