haha
Assorted modifications
Test