OPT Lots of refactoring and new pictures