#7: Added Entity-functionality. Input calculations left.