Hashed out some more tests and ideas