Added a few extra nodes in relation to thoughts about cleaning up the code