Optimizations and Starting of Point System

Optimized a couple places in the code that were too repetative. Also created two boxes for what could be a point system later on.