base commit

Not compiled. Untested.