Namespaces

Added namespaces and started work on testing.