committing progress, hopefully no bugs :-)
resolved merge conflict please no brakey