work on target class
broke a bunch off

should fix most def..