v0.02 file structure change, debug edits, minor tests complete