working on new features and testing