Redo

Next: Fixing members