Partial refactor so I can complete the work at home
Added a bunch of new classes as part of a refactor into sub Movie classes