Updates to simplify stuff. Still needs some work.