In the middle of a few changes. This build is nowhere close to working