Added heartbeats to prevent invalidation
Added layout of Grades and the test cases we need to pass