finish thing class+ if-statement