working on fixing stub errors