Mostly working on page load now.