Bugs fixed. App does not crash now.
Also added a new entity. Should be using it soon.