Moved stuff around. Fixed merge issues.