Add in tweet box, some refactoring (more on the way)