Updates to some functions, moved the request around a bit for link
creation purposes.