Remaining time

This branch has unmerged changes awaiting approval for master.