diff --git a/platformio.ini b/platformio.ini
index bc8dc93..cbcf853 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -16,4 +16,6 @@ lib_deps =
 	esphome/ESP32-audioI2S@^2.0.7
 	me-no-dev/AsyncTCP@^1.1.1
 	me-no-dev/ESP Async WebServer@^1.2.3
+	alanswx/ESPAsyncWiFiManager@^0.31
 monitor_speed = 115200
+board_build.partitions = huge_app.csv
diff --git a/src/WebContent.h b/src/WebContent.h
index e02b20f..4b2d7b5 100644
--- a/src/WebContent.h
+++ b/src/WebContent.h
@@ -1,8 +1,8 @@
 // HTML web page
-const char index_html[] = R"rawliteral(
+const char index_html[] PROGMEM = R"rawliteral(
 <!DOCTYPE HTML><html>
   <head>
-    <title>Hanna Box</title>
+    <title>HannaBox</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <style>
       body { font-family: Arial; text-align: center; margin:0px auto; padding-top: 30px;}
@@ -34,11 +34,11 @@ const char index_html[] = R"rawliteral(
     </style>
   </head>
   <body>
-    <h1>Greenhousino Irrigation System</h1>
-    Pump state: <span id="state"></span><br/><br/>
-    <button class="button" onmousedown="toggleCheckbox('on');" ontouchstart="toggleCheckbox('on');" onmouseup="toggleCheckbox('off');" ontouchend="toggleCheckbox('off');">PUMP!</button><br/><br/>
-    <button class="button" onmouseup="toggleCheckbox('on');" ontouchend="toggleCheckbox('on');">On!</button><br/><br/>
-    <button class="button" onmouseup="toggleCheckbox('off');" ontouchend="toggleCheckbox('off');">Off!</button><br/><br/>
+    <h1>HannaBox</h1>
+
+    Playing %PLAYING%<br/><br/>
+    <button class="button" onmouseup="toggleCheckbox('start');" ontouchend="toggleCheckbox('start');">On!</button><br/><br/>
+    <button class="button" onmouseup="toggleCheckbox('stop');" ontouchend="toggleCheckbox('stop');">Off!</button><br/><br/>
    <script>
    setInterval(getState, 500);
    function toggleCheckbox(x) {
diff --git a/src/main.cpp b/src/main.cpp
index cdc3097..fdd3c0e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,14 +1,17 @@
-// needed for library
+#if defined(ESP8266)
+#include <ESP8266WiFi.h>          //https://github.com/esp8266/Arduino
+#else
 #include <WiFi.h>
-#include "ESPAsyncWebServer.h"
-//#include <ESPAsyncWiFiManager.h>         //https://github.com/tzapu/WiFiManager
+#endif
+
+#include <ESPAsyncWebServer.h>     //Local WebServer used to serve the configuration portal
+#include <ESPAsyncWiFiManager.h>          //https://github.com/tzapu/WiFiManager WiFi Configuration Magic
 
 #include "Audio.h"
 
-#define I2S_DOUT      26  // connect to DAC pin DIN
-#define I2S_BCLK      27  // connect to DAC pin BCK
-#define I2S_LRC       25  // connect to DAC pin LCK
-
+#define I2S_DOUT 26 // connect to DAC pin DIN
+#define I2S_BCLK 27 // connect to DAC pin BCK
+#define I2S_LRC 25  // connect to DAC pin LCK
 
 #include <SPI.h>
 #include <SD.h>
@@ -28,24 +31,30 @@ Audio audio;
 
 // Set web server port number to 80
 AsyncWebServer server(80);
+AsyncWebServer server2(81);
+DNSServer dns;
+File next;
 
 // Variable to store the HTTP request
 String header;
 
-void playNextMp3() {
-  File next = root.openNextFile();
-  
-  if (!next) {
+void playNextMp3()
+{
+  next = root.openNextFile();
+
+  if (!next)
+  {
     root = SD.open("/");
   }
 
-  while (!String(next.name()).endsWith(".mp3")) {
+  while (!String(next.name()).endsWith(".mp3"))
+  {
     next = root.openNextFile();
-    if (!next) {
+    if (!next)
+    {
       Serial.println("no more files found.");
       return;
     }
-
   }
   Serial.print("initialized");
   Serial.print(next.name());
@@ -54,12 +63,31 @@ void playNextMp3() {
   audio.connecttoSD(next.name());
 }
 
-void audio_info(const char *info){
-    //Serial.print("info        "); Serial.println(info);
+void audio_info(const char *info)
+{
+  // Serial.print("info        "); Serial.println(info);
 }
 
+String processor(const String& var)
+{
+  if(var == "PLAYING")
+    return F(next.name());
+  return String();
+}
 
+void stop() {
+  if (audio.isRunning()) {
+    audio.stopSong();
+  }
+}
 
+void start() {
+  if (!next) {
+    playNextMp3();
+  } else {
+    audio.connecttoSD(next.name());
+  }
+}
 
 void setup()
 {
@@ -68,67 +96,69 @@ void setup()
 
   pinMode(D3, INPUT_PULLUP);
 
-  
-  AsyncWebServer server(80);
-  //DNSServer dns;
-  //first parameter is name of access point, second is the password
-  //AsyncWiFiManager wifiManager(&server,&dns);
+  // first parameter is name of access point, second is the password
+  AsyncWiFiManager wifiManager(&server, &dns);
 
-  //fetches ssid and pass and tries to connect
-  //if it does not connect it starts an access point with the specified name
-  //here  "AutoConnectAP"
-  //and goes into a blocking loop awaiting configuration
-  
-  /*
-  if (!wifiManager.autoConnect())
-  {
-    Serial.println("failed to connect and hit timeout");
-    //reset and try again, or maybe put it to deep sleep
-    //ESP.restart();
-    //delay(1000);
-  } else {
-  // if you get here you have connected to the WiFi
-  Serial.println("connected...yeey :)");
-  }
-  */
-
-  WiFi.begin("heim", "0ggnWLS.");
+  wifiManager.autoConnect("HannaBox");
 
   Serial.print("Initializing SD card...");
 
-  if (!SD.begin(D1)) {
+  if (!SD.begin(D1))
+  {
     Serial.println("SD initialization failed!");
-    while (1);
+    while (1)
+      ;
   }
   Serial.println("SD initialization done.");
 
   root = SD.open("/");
-  //printDirectory(root, 0);
+  // printDirectory(root, 0);
   audio.setPinout(I2S_BCLK, I2S_LRC, I2S_DOUT);
   audio.setVolume(12); // 0...21
+  
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request)
+            { request->send_P(200, "text/html", index_html,processor); });
 
-   // Send web page with input fields to client
-  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){
-    request->send_P(200, "text/html", index_html);
+  server.on("/start", HTTP_GET, [] (AsyncWebServerRequest *request) {
+        start();
+        request->send(200, "text/plain", "start");
+    });
+
+  server.on("/stop", HTTP_GET, [] (AsyncWebServerRequest *request) {
+        stop();
+        request->send(200, "text/plain", "stop");
   });
+  
+
+  server.begin();
+  
 }
 
-void printDirectory(File dir, int numTabs) {
-  while (true) {
 
-    File entry =  dir.openNextFile();
-    if (! entry) {
+
+void printDirectory(File dir, int numTabs)
+{
+  while (true)
+  {
+
+    File entry = dir.openNextFile();
+    if (!entry)
+    {
       // no more files
       break;
     }
-    for (uint8_t i = 0; i < numTabs; i++) {
+    for (uint8_t i = 0; i < numTabs; i++)
+    {
       Serial.print('\t');
     }
     Serial.print(entry.name());
-    if (entry.isDirectory()) {
+    if (entry.isDirectory())
+    {
       Serial.println("/");
       printDirectory(entry, numTabs + 1);
-    } else {
+    }
+    else
+    {
       // files have sizes, directories do not
       Serial.print("\t\t");
       Serial.println(entry.size(), DEC);
@@ -137,22 +167,20 @@ void printDirectory(File dir, int numTabs) {
   }
 }
 
-
 void loop()
 {
 
   audio.loop();
-  //Serial.print(digitalRead(D2));
-  
-  if (digitalRead(D3)==LOW) {
-    unsigned long now = millis();
-    if (now-lastStart>startDelay) {
-      playNextMp3(); 
-      Serial.println("mp3 started.");
-      lastStart=now;
-    }
+  // Serial.print(digitalRead(D2));
 
+  if (digitalRead(D3) == LOW)
+  {
+    unsigned long now = millis();
+    if (now - lastStart > startDelay)
+    {
+      playNextMp3();
+      Serial.println("mp3 started.");
+      lastStart = now;
+    }
   }
-  
-  
 }
\ No newline at end of file
