squashing #21, now need to clean up attributes