Organized everything so that it'll work!