Got codebase working