remove handles specific methods
remove logic from handles
class builder