Refactoring and added Tickers. Still needs work.