Ready to merge this?

I see testing stuff added...