More scaffolding

Not sure if this is everything we need to start. There were a couple
classes I made that we might not end up needing