Yeah this seems like a better spaghetti arrangement.