Updates to how I'm building a base