Classes Reconstruction Mini Version

Small changes, re-learning the code. :)