#471 Done, ready for test