adding in marker models
fixed merge conflicts, etc