Got the new and awesome markup/query engine working.