Consolidated version of everything for faster initial dev