:smile: I'm happy about this refactor and more to come! :+1: