Adding methods and some new classes (exceptions, ect...), work in progress ...