Builds out and fixes more boilerplatey stuff