Lots of changes (Mostly obj loading)