Initial dump of progress so far
This probably belongs in git too