Added working remove
Refactored the entire everything!