Add Remove and refactor to allow for multiple types and easy access.