Closes #636

#636

Probably wait on this one until #607 is done