Added TickerTask api support and lots of moving around