first somewhat complete commit