refactoring out into many files
more refactoring
nearly working again…
updated
working
0.2.0