fixed models, starting to implement tag system