Finished refactor so resolve Frame links use utility function everywhere appropriate