Refactored things, and moved things around.