Should have done more design from the start..