With my next set of changes they are much less identical- Its still possible to factorize them out but it would be a very similar amount of code =/ I am going to defer this part until I have a better idea.