Refactored a bunch of things, added remove