Wrap it all in a module
Update README