Fix some errors. This file will NOT compile - it's not fully fleshed out.