0.3 Code Cleanup, non-functional framework with update function