diff --git a/src/app/components/stream/status/poll/poll.component.html b/src/app/components/stream/status/poll/poll.component.html
index a7e25b38..02892c5d 100644
--- a/src/app/components/stream/status/poll/poll.component.html
+++ b/src/app/components/stream/status/poll/poll.component.html
@@ -1,16 +1,17 @@
 <div class="poll">
-    <div *ngFor="let o of poll.options">
+    <div *ngFor="let o of options">
         <!-- <input class="poll__input" id="{{o.title}}" type="{{choiceType}}" name="poll" value="{{o.title}}">
         <label class="noselect poll__label" for="{{o.title}}">{{o.title}}</label>
         <br /> -->
 
         <label class="poll__container">{{o.title}}
-            <input class="poll__container__input" type="{{choiceType}}" name="{{pollName}}">
+            <input class="poll__container__input" type="{{choiceType}}" name="{{pollName}}" 
+                value="{{o.title}}" (change)="onSelectionChange(o)">
             <span class="poll__container__checkmark" [ngClass]="{'poll__container__checkmark--box' : choiceType=='checkbox', 'poll__container__checkmark--round': choiceType=='radio'}"></span>
         </label>
     </div>
     <div class="poll__voting">
-        <button href class="btn btn-sm btn-custom-primary poll__btn-vote" title="don't boo, vote!">Vote</button>
+        <button href class="btn btn-sm btn-custom-primary poll__btn-vote" title="don't boo, vote!" (click)="vote()">Vote</button>
         <div class="poll__statistics">{{poll.votes_count}} votes - X days left</div>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/app/components/stream/status/poll/poll.component.ts b/src/app/components/stream/status/poll/poll.component.ts
index 77409030..c62c7e5d 100644
--- a/src/app/components/stream/status/poll/poll.component.ts
+++ b/src/app/components/stream/status/poll/poll.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit, Input } from '@angular/core';
 
-import { Poll } from '../../../../services/models/mastodon.interfaces';
+import { Poll, PollOption } from '../../../../services/models/mastodon.interfaces';
+import { AccountInfo } from '../../../../states/accounts.state';
 
 @Component({
     selector: 'app-poll',
@@ -8,22 +9,66 @@ import { Poll } from '../../../../services/models/mastodon.interfaces';
     styleUrls: ['./poll.component.scss']
 })
 export class PollComponent implements OnInit {
-    pollName: string;
+    pollName: string;    
+    choiceType: string;
 
-    choiceType: string;// = 'radio';
-    //choiceType: string = 'checkbox';
+    private pollSelection: number[] = [];
+    options: PollOptionWrapper[] = [];
 
     @Input() poll: Poll;
+    @Input() provider: AccountInfo;
 
     constructor() { }
 
     ngOnInit() {
         this.pollName = this.poll.id;
+        
+        // this.poll.multiple = true;
+
         if(this.poll.multiple){
             this.choiceType = 'checkbox';
         } else {
             this.choiceType = 'radio';
         }
+
+        let i = 0;
+        for(let opt of this.poll.options){
+            let optWrapper = new PollOptionWrapper(i, opt);
+            this.options.push(optWrapper);
+            i++;
+        }
+    }
+
+    vote(): boolean {
+        console.log(this.pollSelection);
+
+        return false;
+    }
+
+    onSelectionChange(entry: PollOptionWrapper){
+        let index = entry.id;
+        if(this.poll.multiple){
+            if(this.pollSelection.includes(index)){
+                this.pollSelection = this.pollSelection.filter(x => x !== index);
+            } else {
+                this.pollSelection.push(index);
+            }
+        } else {
+            this.pollSelection.length = 0;
+            this.pollSelection.push(index);
+        }
     }
 
 }
+
+class PollOptionWrapper implements PollOption {
+    constructor(index: number, option: PollOption){
+        this.id = index;
+        this.title = option.title;
+        this.votes_count = option.votes_count;
+    }
+
+    id: number;
+    title: string;    
+    votes_count: number;
+}
\ No newline at end of file
diff --git a/src/app/components/stream/status/status.component.html b/src/app/components/stream/status/status.component.html
index 1dfa129b..f3ac3722 100644
--- a/src/app/components/stream/status/status.component.html
+++ b/src/app/components/stream/status/status.component.html
@@ -67,7 +67,8 @@
             (accountSelected)="accountSelected($event)" (hashtagSelected)="hashtagSelected($event)"
             (textSelected)="textSelected()"></app-databinded-text>
 
-        <app-poll class="status__poll" *ngIf="!isContentWarned && displayedStatus.poll" [poll]="displayedStatus.poll"></app-poll>
+        <app-poll class="status__poll" *ngIf="!isContentWarned && displayedStatus.poll" 
+            [poll]="displayedStatus.poll" [provider]="statusWrapper.provider"></app-poll>
 
         <app-card class="status__card" *ngIf="!isContentWarned && displayedStatus.card && !hasAttachments" [card]="displayedStatus.card"></app-card>