work on cleaning up structure stuff, rewriting block-data manager