moving to own store to try to cut down amount of small object creation
better method name
fix occupied tracking bug