a lot of changes additions here, commit before pushing up to pantheon