Revert Changes

Something broke, so reverted to last commit. Unsure of cause of breakage