Feature/rough in models