Proceeded with testing. Cleaned some things up.