initial, partially tested commit