ENH: Refactor
ENH: Added instantaneous tasks