adding nice features to my super nice branch
Merge branch 'paals-branch' into ninatullebranch