at least it compiles...
More refactoring
More refactoring
More refactoring
don't upload jars
new converter
Merge branch 'crazy_refactoring'