Update: Move more to functions.