Beginning to separate functions out to make the screens a bit simpler.