Begin tweaking error handling, rewrite code, etc.