shoulda commited a while ago, adding timer, scoreboard
fixed merge conflicts... hopefully
merged ALL the things