Changed all the painting components to be within hashmaps for efficient add/removal