working commit, its not perfect, but commiting now just in case.