Revert "fixing the merge with devel"

This reverts commit 8a97e4fba2d03ac07266510a7845866eb065c4d7.
Revert "working still on including gemoetry items"

This reverts commit 621dc4564f3c0e307361e1d328977aa0d5b96ae8.
Revert "removed signs of debugging"

This reverts commit b24b4a9096c18a79666473b4b588b768f14c8ab7.
very messy merge, hopefully clean