New entry, and some significant code additions