Switch from storing entities on and object to array. Fixes #1.