Committed a more or less working version.
56 files changed