Reviewed and updated mvMax5
A few corrections seemed appropriate where
multiple classes with the same name existed
This will probably need to be reviewed and fixed again
Still needs testing (definitely not ready for deployment)