some stuff is working
Merge branch 'FinalCountdown' of https://github.com/nosaesa/ee121 into FinalCountdown