Preliminary attempt at finding conservation equations
Fixed merge conflict