Updated shape framework, now having trouble with loading shapes
performance