needs to rebuild completely!

I'm working on it...