Adding new features and stuff