Compiling works, but still a handful of bugs