commit before switching to development
deleted existing copy due to unwanted changes
merge conflicts fixed on fresh copy
Merging old stances branch with maz's new one he insisted on making. *eyeroll*