Some changes to the classes, plus added python