Formatting
Moved a class
Fixed e evaluation, added test
Missing classes