Gds upgrade moar maslow

Bunch of stuff ODI doesn't use but I need it in here so further form changes aren't substantially harder for me to incorporate.