Adding VideoLoader

Also some random tidying up.