Start creating as a package with tests