sbibek: commiting near final changes