More prep work to enable gui