Updated cell decomp, added graph creation
Fixed merge issue