Some issues, Still working on this