WIP Rework Main Loop