Grant/working

combined our stuff