Fixes #219, prepares for #217, and Closes #235