Added obj files and loading - to replace with json loader? janky as **** right now
merge and stuff