More Partial

Think I'm scrapping this branch.