First shot at optimizing page load

same as above