Initial grace implementation [TESTING]