Forgot to commit this stuff from the last time I worked on the project. Video window and some misc bits