checkout and return working
consolidate and simplify API.  Remove old methods