🤯 Nearly done with refactoring and rerendering - took much longer than I expected phew