Andon refactor galore, got it essentially working