Design changes... haven't even started writing any serious code yet