More work, GUI and container base code in place