Lots of changes getting ready for entity test

-Gotta wait to get home before testing, making changes and checking in a
real build