Got some form of entity working...