WIP Commit. DO NOT PULL ME. (Necessary for logistical reasons)