diff --git a/lib/App.pm b/lib/App.pm
index 0506139..3fa6c13 100644
--- a/lib/App.pm
+++ b/lib/App.pm
@@ -11,6 +11,7 @@ use App::Config;
 use App::Controller::Paste;
 use App::Controller::Eval;
 use App::Controller::Apiv1;
+use App::Controller::Apiv2;
 use App::Model::Paste;
 use App::Model::Eval;
 use App::Model::Perlbot;
@@ -44,9 +45,11 @@ sub startup {
 sub setup_routes {
   my $self = shift;
 
+  # TODO some kind of app config for this
   App::Controller::Paste->routes($self->routes);
   App::Controller::Eval->routes($self->routes);
   App::Controller::Apiv1->routes($self->routes);
+  App::Controller::Apiv2->routes($self->routes);
 }
 
 1;
diff --git a/lib/App/Controller/Apiv2.pm b/lib/App/Controller/Apiv2.pm
new file mode 100644
index 0000000..68fd211
--- /dev/null
+++ b/lib/App/Controller/Apiv2.pm
@@ -0,0 +1,134 @@
+package App::Controller::Apiv2;
+
+use strict;
+use warnings;
+
+use Mojo::Base 'Mojolicious::Controller';
+use Function::Parameters;
+
+sub routes {
+  my ($class, $r) = @_;
+
+  my $route = sub {
+    my ($method, $route, $action) = @_;
+    $r->$method($route)->to(controller => 'apiv2', action => $action);
+  };
+
+  # TODO make this use an automatic base for the version on the endpoints
+
+  $route->(get => '/api/v2/paste/:pasteid' => 'api_get_paste');
+  $route->(post => '/api/v2/paste' => 'api_post_paste');
+  $route->(post => '/api/v2/add_file' => 'api_post_add_file');
+  $route->(get => '/api/v2/languages' => 'api_get_languages');
+  $route->(get => '/api/v2/channels' => 'api_get_channels');
+}
+
+# Takes in a set of uploaded files, and returns you a new editor page with them plus an empty file
+method api_post_add_file($c: ) {
+  # Get the file count, so we can setup our structures.
+  my $req = $c->req;
+  my $params = $req->params->to_hash;
+  my $file_count = scalar(grep {/^filename/} keys $params->%*);
+
+  $params->{files} = +{
+    map {
+      my $fn = delete $params->{"filename_".$_};
+      my $fc = delete $params->{"filecontent_".$_};
+      $fn => $fc
+    } 1..$file_count
+  };
+
+  $c->render(json => $params);
+}
+
+sub api_get_paste {
+    my $c = shift;
+    my $pasteid = $c->param('pasteid');
+    
+    my $row = $c->paste->get_paste($pasteid); 
+
+    if ($row) {
+      $c->delay(sub {
+        my ($delay) = @_;
+          $c->eval->get_eval($pasteid, $row->{paste}, [$row->{language}], $delay->begin(0, 1))
+        },
+        sub {
+          my ($delay, $output_hr) = @_;
+
+          my ($output_lang) = keys %$output_hr; # grab a random output value, should be the first one since multilang support isn't working yet
+          my ($output) = $output_hr->{$output_lang};
+          my $data = {
+            paste => $row->{paste},
+            when => $row->{when},
+            username => $row->{who},
+            description => $row->{desc},
+            language => $output_lang,
+            output => $output,
+            warning => "If this was multi-language paste, you just got a random language",
+          };
+
+          $c->render(json => $data);
+        });
+    } else {
+# 404
+        return $c->reply->not_found;
+    }
+};
+
+sub api_post_paste {
+    my $c = shift;
+
+    # TODO rate limiting
+
+    my @args = map {($c->param($_))} qw/paste username description channel expire language/;
+
+    my $id = $c->paste->insert_pastebin(@args, $c->tx->remote_address);
+    my ($code, $who, $desc, $channel) = @args;
+
+    # TODO select which one based on config
+    # TODO make this use the config, or http params for the url
+
+#    if (my $type = App::Spamfilter::is_spam($c, $who, $desc, $code)) {
+#        warn "I thought this was spam! $type";
+#    } else {
+        if ($channel) { # TODO config for allowing announcements
+          my $words = $c->paste->banned_word_list_re;
+          unless ($code =~ $words || $who =~ $words || $desc =~ $words || $c->paste->is_banned_ip($c->tx->remote_address)) {
+            $c->perlbot->announce($channel, $who, substr($desc, 0, 40), $c->req->url->base()."/p/$id");
+          }
+        }
+#    }
+
+    $c->render(json => {
+      url => $c->req->url->base()."/p/$id", # TODO base url in config
+      id => $id,
+    });
+
+    if ($c->param('redirect')) {
+      $c->redirect_to("/p/$id");
+    }
+};
+
+## TODO make this come from a perlbot model
+sub api_get_languages {
+  my $c=shift;
+
+  my $lang_ar = $c->languages->get_languages();
+
+  $c->render(json => {languages => $lang_ar});
+};
+
+sub api_get_channels {
+  my $c=shift;
+
+  $c->render(json => {channels => [
+    {name => "localhost:perlbot:#perl", description => "Freenode #perl"},
+    {name => "localhost:perlbot:#perlbot", description => "Freenode #perlbot"},
+    {name => "localhost:perlbot:#perlcafe", description => "Freenode #perlcafe"},
+    {name => "localhost:perlbot:#buutbot", description => "Freenode #buubot"},
+    {name => "localhost:perlbot:##botparadise", description => "Freenode ##botparadise"},
+    {name => "localhost:perlbot-magnet:#perl", description => "irc.perl.net #perl"},
+  ]});
+};
+
+1;