Changed around a few things, late commit.