Revert "everything except error catching is complete"

This reverts commit 063c1b1bdf3558e0d19b0aaeb9d18494f7d8ec62.