Some work towards Manual Mode #10