Starting to implement basic Entity functionality