Funny you have this volume calc. function because I don't think we've synced after I implemented it. Did you add it manually, or copy over geometry.h?