First working version, where the definition of 'works' is up for debate.
Merge in all work done to date.