Halfdone....need to test tomorrow