Working on breaking up functions logically