First version that actually compiles correctly. Woot!