Added partial, still working on it