Weird Refactor

Broken Git, attempting fix soon