more refactoring, fixed video bug, moved to consort host for now