Beginning Stage 2 Rewrite Using Clover Namespace