Merge Elgar's new features into bit old Octagami fork

Title tells everything.