Moving to a require base solution