Working on saving assumptions

Relates to #151