Started work on Entity

Started work on Entity