almost finished
Deleted unused