Initial commit of working solution