Started work on Entity