new tree object, more clean, swag and tests