Prod Version 1

Production ready version 1