make base, pull up now works. Also redid some of the require dependencies.