Looks like its working, needs some code adjust before deployment