Commiting some missing pieces

$location on core and updated to new que template.