adding ability to have multiple items, tweaking models