Pointless code consolidation; moved GUI into Engine permanently