Dirty hax for location and data
Finished messy merge