Initial workingish commit
Working solution, about to clean up source files