Compiling successfully
Checkin after massive refactor