apparently touched first bugs - commiting working version before digging