Working final version with source install
Once more tweak to try and get sourcing correct