WOOOO SEMIFINAL CODE
Merge origin/master