re-added pickup and return times to checkout, rewrote factories