Initial rewrite of basic usage