added sales side and changed miscilanious other things
fixed merge problems with sales side. I hope.