still fixing issues maybe