New branch for refactoring code as per TODO item in NOTES
Added note to self for new branch