Pushing before I completely overhaul the firebase...