initial commit. Basic stuff works.
merged