Started hitting on the design a bit more