total refactor for atmospherejs.com