starting to make the code production ready