Refactor Complete
 - It's all good now... Or at least it should be
 - We may need to do some testing on it but it seems good for now.