9:45AM Commit: Few small changes

Preparing for MultiBlock/Structure