Working on new record features and bug fixes