added everything, think im done?