Adding #42 & new helper functions for it and #357