Added PoC for a noshared option and rearranged some stuff