still fixing some namespace/requirement errors