Continued updating functions. Most of the functionality should be there now.