Groundwork project

I have updated to code as per the tasks mentioned.