1.0 smash

Updates to the base structure.