cleanued up quite a bit
removed all the org stuff,