Changes for Lucas and new server
Merge https://github.com/gdyer/MBS-Now