here we go again, more problems
please merge
trying to fix things still
almost there