Moving to new codebase

redesigning to fix existing issues