Completed the final few bits of layout, one final method and then testing and cleaing up because the last few methods look so ugly it makes me want to cry