May not be complete, just want to get this PR'ed so we don't forget

Please don't grade this til the deadline!