Closes #576

#576

Probably wait until #607 is done.