Mortimer/new features

New features