WIP Code - Compiles Now

Still need to test etc, but compiles now