Moved stuff around
Fix merge conflicts