Added inheritance structure skeletons and added entity collision function