Small refactor. Allow for live updating elements.