Started work on Entity implementation