- Structures need to be renamed a bit, missing doxygen
- Optimization pending, but that's okay, since future zone API should take care of those