Adding defaults

Not planning on pulling yet - just want to leave this open to see the diff

Adding basic data sources and several computed variables

So far so good