Removed dependency on timer - was too easy to overload...