Almost done, just need to add loops