The code's a mess, but decent progress in Milestone 2!