Added LOTS of null checks
Updated packages
Moved package
New package, null checks, and some fixes
Null checks