More proper testing.
Added a little more robust handling.
Started Adaline Adapter work.