Commit 3/7/13

lots of stuff