Fixed bug in pin locations
Fixing delete/destroy bug
More fixes
More fixes.  Blame Danny
Yet more problems caused by Danny