Port over Christian's projects to new codebase