Renamed Properties and began making edits to logic for increased functionality