refactor completelly, based on Tweetflight Presentation