Cleaned up code, using new structure calls
Commented out seemingly broken code, Klaas please review structure.py:206