Started adding attributes, hope it goes better this time.