Added lots of stuff! Mostly just so I can go home and continue working...