Extensive updates

Added in the defaults and start templating