Clean up, add tests
Add message class, including encryption method