issue37: redoing how functions are called on page load
issue37: redoing how functions are called on page load part2
Merge branch 'issue37' into dev