Improve __str__
Add collection functions (broken)