Some progress on #61
progress on #61
huge refactor

it compiles at least!
code complete on #61

now for debugging and testing.

much cleaner, i hope this works...
debugging and debug printfs
Close #61