Started working on affine accounting
after merge
Mouse handled properly