Setup for a more dynamic atmosphere

Also changed package to be the right style.
still trying to fix branch problem