First commit

Still very beta, but does the work