Micah's stuff attempt 2.

My additions should suck less this time around.  I the last set of changes I sent can be ignored.  These changes reflect the final state of my canvas.