Working on fixing up asserts with messages.