seems a little ugly. i'd rather just update when we move to 2.0 i think