Added a bunch of stuff. Should commit more often.