merged calvin's things, no errors, lots of warnings