Fixed bugs but add things are still messy