Moving some stuff around and added a score keeper