Issue#448

Closes #448.
Built off of #521 so this shouldn't be reviewed until that is merged.