Big commit; pushing all changes up