Entity is nearly finished

Entity is nearly finished. Still needs a few things done though