Added lots of stuff. Gonna have to commit more often.