some hard coded issues still need to be fixed