Starting to add Stationary Entities, will finish later