New version: works with objects/classes now!