First commit in a while. currently at a good state-- everything is beautiful on linux in FF