Made some more changes, moved things around...