Further rental calc app work