Still working on grade input