Minor refactors to base objects (util functions) & Build Adapter!

AWWWWW YISSSSS CODE...crumbs...?