WIP on getting build to work again