REDESIGNED ALL THE THINGS.
Fixed merge conflicts.