Fixes #70.

- Need to clean up with better implementation and error handling.