* (Sommenter) Updated for knighty's massive changes