- Reverted some code and fixed crashing. Still not working properly
quite yet though.