Started work on factoring out the arrow paths