Refactored-- pulled occupied char out of shape class (as it was unnecessary, name char serves same purpose)