This is a shitty commit. Noncompiling, but commit now so I can work on it tomorrow.