Second commit

Added a ton of stuff.  It kind of works now.