Move over to translated strings
Test cleanup
Add some groundwork for future functionality