Added new Firebase-persisted variables
Restructure and coffeescript