Features added (not currently finished)