Items that we really should address over the summer before CNY Hackathon when we test out all our fixes