Review 1

Hey nate,
here's a review of the current code. check the various FIXMEs for outstanding problems.

-chad