Final version for tomorrow (might add point counter if I have time)