Matrix code refactored
Clean up some deprecated features
Added geometry to lib build
CodeFix
Basic geometry ready for build