Many changes. Shouldcommit more often!