Refactor for a much simplier GUI