Had to restart project (just the project itself, not the source)
Merge https://github.com/weslgames/MERCury