Weekend

Refactor and Mouse bug fix (mouseup was not firing under interupt
conditions