Changing the design... def a better one.