Business reqs done. fixes #2