added some todos
little bit changed api for partials