refactored heavily, added now playing and upcoming