Fix rows and start working on Macro's