Rebase Shared to most current
Updated build system to use most recent Shared