OO reimplementation.
Deleting tmp's...