fixed the adapter to use the actual classes/homeowkr