Debugged newly separated structure, tests passing.

Finally in a position to work on making exception handling smarter.