Updates to current code, move some JS to Static which should have been