new changes almost ready but have to add menu screens