WiP - preparing for release to VPS