Make a lot of changes to the testAdaline. It is almost working.

I think.
Getting rid of generics for now.
Clean up stuff.