Small cleanups
Fixed merge issues
Initial version of Reverse Solver
Reverse tests