still won't compile, but here are my changes so far