Progress on architecture and added tests.