Switched to urequire, added .extend to main classes