everything compiles with eric's stuff now