Missing bits from previous commit, this actually compiles =/