Removed force functions used in testing, created Entity class and updated State to handle multiple Entities