lots of changes made, time to test them.