Moved things around and working on remove functionality