Changes to overall architecture; Shapes and components draw themselves; Added SRLock