Revert "trying to merge files so that I can revert and bugtest properly, all hell seems to have broken loose on my git..."

This reverts commit d36fa3162a08e33ceb9c396227593941f5132b41.