Testing okay
Need classes review