Almost final

added a bunch of stuff like a lot....