Work on Entity

More testing with Scanner.