Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/wifi-connect:use-nm-for-ap into ~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-connect:master

[Alfonso Sanchez-Beato]

Refactor of wifi-connect to use now NM instead of wifi-ap.

Refactor of wifi-connect to use now NM instead of wifi-ap.

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 223cd235a40065079971211ab2a3a72749b3d730

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1305/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:223cd235a40065079971211ab2a3a72749b3d730
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/482/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/513/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/513
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/513
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/513/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1305
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1047
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1095/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/482/rebuild

review: Needs Fixing (continuous-integration)

[Kyle Nitzsche (knitzsche)]

I'm going to approve this "Very Large Merge™" without more than a quick scan since you are taking the lead on adjusting the code base for new opps.

review: Approve

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Thanks Kyle!

review: Approve (continuous-integration)

diff --git a/server/middleware.go b/avahi/avahi_test.go
 similarity index 63%
 rename from server/middleware.go
 rename to avahi/avahi_test.go
index 99bd6f9..486121f 100644
--- a/server/middleware.go
+++ b/avahi/avahi_test.go
@@ -1,5 +1,3 @@
-// -*- Mode: Go; indent-tabs-mode: t -*-
-
 /*
  * Copyright (C) 2017 Canonical Ltd
  *
@@ -17,30 +15,12 @@
  *
  */
 
-package server
+package avahi
 
 import (
-	"net/http"
-
-	"launchpad.net/wifi-connect/netman"
-	"launchpad.net/wifi-connect/wifiap"
+	"testing"
 )
 
-var wifiapClient wifiap.Operations
-var netmanClient netman.Operations
-
-// Middleware to pre-process web service requests
-func Middleware(inner http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-
-		if wifiapClient == nil {
-			wifiapClient = wifiap.DefaultClient()
-		}
-
-		if netmanClient == nil {
-			netmanClient = netman.DefaultClient()
-		}
-
-		inner.ServeHTTP(w, r)
-	})
+func TestAvahi(t *testing.T) {
+	// TODO Fill it when we really use avahi
 }
diff --git a/cmd/main.go b/cmd/main.go
 deleted file mode 100644
index 2eebb48..0000000
--- a/cmd/main.go
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright (C) 2017 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package main
-
-import (
-	"bufio"
-	"fmt"
-	"log"
-	"os"
-	"os/signal"
-	"strings"
-	"sync"
-
-	"launchpad.net/wifi-connect/netman"
-	"launchpad.net/wifi-connect/server"
-	"launchpad.net/wifi-connect/utils"
-	"launchpad.net/wifi-connect/wifiap"
-)
-
-func help() string {
-
-	text :=
-		`Usage: sudo wifi-connect COMMAND [VALUE]
-
-Commands:
-	stop:	 		Disables wifi-connect from automatic control, leaving system 
-				in current state
-	start:	 		Enables wifi-connect as automatic controller, restarting from
-				a clean state
-	show-ap:		Show AP configuration
-	ssid VALUE: 		Set the AP ssid (causes AP restart if it is UP)
-	passphrase VALUE: 	Set the AP passphrase (cause AP restart if it is UP)
-`
-	return text
-}
-
-// checkSudo return false if the current user is not root, else true
-func checkSudo() bool {
-	if os.Geteuid() != 0 {
-		fmt.Println("Error: This command requires sudo")
-		return false
-	}
-	return true
-}
-
-func waitForCtrlC() {
-	var endWaiter sync.WaitGroup
-	endWaiter.Add(1)
-	var signalChannel chan os.Signal
-	signalChannel = make(chan os.Signal, 1)
-	signal.Notify(signalChannel, os.Interrupt)
-	go func() {
-		<-signalChannel
-		endWaiter.Done()
-	}()
-	endWaiter.Wait()
-}
-
-func main() {
-
-	log.SetFlags(log.Lshortfile)
-	log.SetPrefix("== wifi-connect: ")
-
-	if len(os.Args) < 2 {
-		fmt.Println("Error: no command arguments provided")
-		return
-	}
-	args := os.Args[1:]
-
-	switch args[0] {
-	case "help":
-		fmt.Printf("%s\n", help())
-	case "-help":
-		fmt.Printf("%s\n", help())
-	case "-h":
-		fmt.Printf("%s\n", help())
-	case "--help":
-		fmt.Printf("%s\n", help())
-	case "stop":
-		if !checkSudo() {
-			return
-		}
-		err := utils.WriteFlagFile(os.Getenv("SNAP_COMMON") + "/manualMode")
-		if err != nil {
-			fmt.Println(err)
-			return
-		}
-		fmt.Println("entering MANUAL Mode. Wifi-connect has stopped managing state. Use 'start' to restore normal operations")
-	case "start":
-		if !checkSudo() {
-			return
-		}
-		err := utils.RemoveFlagFile(os.Getenv("SNAP_COMMON") + "/manualMode")
-		if err != nil {
-			fmt.Println("Error:", err)
-			return
-		}
-		fmt.Println("Entering NORMAL Mode.")
-	case "show-ap":
-		if !checkSudo() {
-			return
-		}
-		wifiAPClient := wifiap.DefaultClient()
-		result, err := wifiAPClient.Show()
-		if err != nil {
-			fmt.Println("Error:", err)
-			return
-		}
-		if result != nil {
-			utils.PrintMapSorted(result)
-			return
-		}
-	case "ssid":
-		if !checkSudo() {
-			return
-		}
-		if len(os.Args) < 3 {
-			fmt.Println("Error: no ssid provided")
-			return
-		}
-		wifiAPClient := wifiap.DefaultClient()
-		wifiAPClient.SetSsid(os.Args[2])
-	case "passphrase":
-		if !checkSudo() {
-			return
-		}
-		if len(os.Args) < 3 {
-			fmt.Println("Error: no passphrase provided")
-			return
-		}
-		if len(os.Args[2]) < 13 {
-			fmt.Println("Error: passphrase must be at least 13 chars long")
-			return
-		}
-		wifiAPClient := wifiap.DefaultClient()
-		wifiAPClient.SetPassphrase(os.Args[2])
-	case "get-devices":
-		c := netman.DefaultClient()
-		devices := c.GetDevices()
-		for d := range devices {
-			fmt.Println(d)
-		}
-	case "get-wifi-devices":
-		c := netman.DefaultClient()
-		devices := c.GetWifiDevices(c.GetDevices())
-		for d := range devices {
-			fmt.Println(d)
-		}
-	case "get-ssids":
-		c := netman.DefaultClient()
-		SSIDs, _, _ := c.Ssids()
-		var out string
-		for _, ssid := range SSIDs {
-			out += strings.TrimSpace(ssid.Ssid) + ","
-		}
-		if len(out) > 0 {
-			fmt.Printf("%s\n", out[:len(out)-1])
-		}
-	case "check-connected":
-		c := netman.DefaultClient()
-		if c.ConnectedWifi(c.GetWifiDevices(c.GetDevices())) {
-			fmt.Println("Device is connected")
-		} else {
-			fmt.Println("Device is not connected")
-		}
-
-	case "check-connected-wifi":
-		c := netman.DefaultClient()
-		if c.ConnectedWifi(c.GetWifiDevices(c.GetDevices())) {
-			fmt.Println("Device is connected to external wifi AP")
-		} else {
-			fmt.Println("Device is not connected to external wifi AP")
-		}
-	case "disconnect-wifi":
-		c := netman.DefaultClient()
-		c.DisconnectWifi(c.GetWifiDevices(c.GetDevices()))
-	case "wifis-managed":
-		c := netman.DefaultClient()
-		wifis, err := c.WifisManaged(c.GetWifiDevices(c.GetDevices()))
-		if err != nil {
-			fmt.Println(err)
-			return
-		}
-		for k, v := range wifis {
-			fmt.Printf("%s : %s\n", k, v)
-		}
-	case "manage-iface":
-		if len(os.Args) < 3 {
-			fmt.Println("Error: no interface provided")
-			return
-		}
-		c := netman.DefaultClient()
-		c.SetIfaceManaged(os.Args[2], true, c.GetWifiDevices(c.GetDevices()))
-	case "unmanage-iface":
-		if len(os.Args) < 3 {
-			fmt.Println("Error: no interface provided")
-			return
-		}
-		c := netman.DefaultClient()
-		c.SetIfaceManaged(os.Args[2], false, c.GetWifiDevices(c.GetDevices()))
-	case "connect":
-		c := netman.DefaultClient()
-		SSIDs, ap2device, ssid2ap := c.Ssids()
-		for _, ssid := range SSIDs {
-			fmt.Printf("    %v\n", ssid.Ssid)
-		}
-		reader := bufio.NewReader(os.Stdin)
-		fmt.Print("Connect to AP. Enter SSID: ")
-		ssid, _ := reader.ReadString('\n')
-		ssid = strings.TrimSpace(ssid)
-		fmt.Print("Enter phasprase: ")
-		pw, _ := reader.ReadString('\n')
-		pw = strings.TrimSpace(pw)
-		c.ConnectAp(ssid, pw, ap2device, ssid2ap)
-	case "management":
-		server.Address = server.TestingAddress
-		if err := server.StartManagementServer(); err != nil {
-			fmt.Printf("Could not start management server: %v\n", err)
-			return
-		}
-		waitForCtrlC()
-	case "operational":
-		server.Address = server.TestingAddress
-		if err := server.StartOperationalServer(); err != nil {
-			fmt.Printf("Could not start operational server: %v\n", err)
-			return
-		}
-		waitForCtrlC()
-	case "set-portal-password":
-		if len(os.Args) < 3 {
-			fmt.Println("Error: no string to hash provided")
-			return
-		}
-		if len(os.Args[2]) < 8 {
-			fmt.Println("Error: password must be at least 8 characters long")
-			return
-		}
-		b, err := utils.HashIt(os.Args[2])
-		if err != nil {
-			fmt.Println("Error hashing:", err)
-			return
-		}
-		fmt.Println(string(b))
-	default:
-		fmt.Println("Error. Your command is not supported. Please try 'help'")
-	}
-}
diff --git a/daemon/daemon.go b/daemon/daemon.go
index 1830491..d1af3a9 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -18,242 +18,496 @@
 package daemon
 
 import (
-	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"log"
+	"net"
 	"os"
-	"path/filepath"
+	"os/exec"
+	"os/signal"
+	"strconv"
+	"syscall"
+	"time"
 
-	"launchpad.net/wifi-connect/avahi"
+	"github.com/godbus/dbus"
+	"launchpad.net/wifi-connect/netman"
 	"launchpad.net/wifi-connect/server"
 	"launchpad.net/wifi-connect/utils"
-	"launchpad.net/wifi-connect/wifiap"
 )
 
-// enum to track current system state
+type serviceState int
+
 const (
-	STARTING = 0 + iota
-	MANAGING
-	OPERATING
-	MANUAL
+	stStarting serviceState = iota
+	stManaging
+	stOperating
 )
 
-var manualFlagPath string
-var waitFlagPath string
-var previousState = STARTING
-var state = STARTING
-
-// PreConfigFile is the path to the file that stores the hash of the portals password
-var PreConfigFile = filepath.Join(os.Getenv("SNAP_COMMON"), "pre-config.json")
-
-// PreConfig is the struct representing a configuration
-type PreConfig struct {
-	Passphrase   string `json:"wifi.security-passphrase,omitempty"`
-	Ssid         string `json:"wifi.ssid,omitempty"`
-	Interface    string `json:"wifi.interface,omitempty"`
-	Password     string `json:"portal.password,omitempty"`
-	Operational  bool   `json:"portal.operational,omitempty"`    //whether to show the operational portal
-	NoResetCreds bool   `json:"portal.no-reset-creds,omitempty"` //whether user must reset passphrase and password on first use of mgmt portal
+func (s serviceState) String() string {
+	return [...]string{"Starting", "Managing", "Operating"}[s]
 }
 
-// Client is the base type for both testing and runtime
-type Client struct {
-}
+const (
+	waitBeforeScanSec = 2
+)
 
-// GetClient returns a client for runtime or testing
-func GetClient() *Client {
-	return &Client{}
+// Service models the high level wifi-connect service
+type Service struct {
+	config           *utils.Config
+	cnetman          *netman.Client
+	devicePath       string
+	apSettingsPath   string
+	apActiveConnPath string
+	ssidLs           utils.SsidList
+	dnsmasqCmd       *exec.Cmd
+	chSigs           chan os.Signal
+	chUserEvs        chan server.UserEvent
+	// Arguments for port forwarding rule
+	iptblForwArgs []string
 }
 
-// used to clase the operational http server
-var err error
-
-// GetManualFlagPath returns the current path
-func (c *Client) GetManualFlagPath() string {
-	return manualFlagPath
-}
+// Creates the run time configuration based on available wifi interfaces and the
+// configuration loaded from config.json.
+func (s *Service) setDefaults() error {
+	var err error
+	// If no interface is selected by configuration, just take the first one
+	// returned by GetWifiDevices().
+	if s.config.Wifi.Interface == "" {
+		devPaths := s.cnetman.GetWifiDevices()
+		if len(devPaths) == 0 {
+			return fmt.Errorf("no wifi device found")
+		}
+		s.devicePath = devPaths[0]
+		iface, err := s.cnetman.GetIfaceFromDevicePath(devPaths[0])
+		if err != nil {
+			return err
+		}
+		s.config.Wifi.Interface = iface
+	} else {
+		s.devicePath, err = s.cnetman.
+			GetDevicePathFromIface(s.config.Wifi.Interface)
+		if err != nil {
+			return err
+		}
+	}
+	log.Printf("setDefaults: using interface %s", s.config.Wifi.Interface)
 
-// SetManualFlagPath sets the current path
-func (c *Client) SetManualFlagPath(s string) {
-	manualFlagPath = s
-}
+	if len(s.config.Portal.Password) > 0 {
+		log.Print("setDefaults: portal password being set")
+		_, err := utils.HashIt(s.config.Portal.Password)
+		if err != nil {
+			log.Printf("setDefaults: password err: %v", err)
+			return err
+		}
+	}
 
-// GetWaitFlagPath returns the current path
-func (c *Client) GetWaitFlagPath() string {
-	return waitFlagPath
+	return nil
 }
 
-// SetWaitFlagPath sets the current path
-func (c *Client) SetWaitFlagPath(s string) {
-	waitFlagPath = s
-}
+// GetService returns a service object for runtime or testing
+func GetService(cfg *utils.Config) *Service {
+	if cfg.Portal.Operational {
+		log.Print("operational portal is enabled")
+	}
 
-// GetPreviousState returns the daemon previous state
-func (c *Client) GetPreviousState() int {
-	return previousState
-}
+	chSigs := make(chan os.Signal, 1)
+	signal.Notify(chSigs, syscall.SIGINT, syscall.SIGTERM)
 
-// SetPreviousState sets daemon previous state
-func (c *Client) SetPreviousState(i int) {
-	previousState = i
-	return
-}
+	chUserEvs := make(chan server.UserEvent)
 
-// GetState returns the daemon state
-func (c *Client) GetState() int {
-	return state
-}
+	cnetman := netman.DefaultClient()
 
-// SetState sets the daemon state and updates the previous state
-func (c *Client) SetState(i int) {
-	previousState = state
-	state = i
-}
+	service := &Service{config: cfg, cnetman: cnetman, chSigs: chSigs,
+		chUserEvs: chUserEvs}
 
-// CheckWaitApConnect returns true if the flag wait file exists
-// and false if it does not
-func (c *Client) CheckWaitApConnect() bool {
-	if _, err := os.Stat(waitFlagPath); os.IsNotExist(err) {
-		return false
-	}
-	return true
+	return service
 }
 
-// ManualMode enables the daemon to loop without action if in manual mode
-// It returns true if the manual mode flag wait file exists
-// and false if it does not. If it does not exist and the mode is MANUAL, the
-// state is set to STARTING. If it does exist and the mode is not MANUAL, state
-// is set to MANUAL
-func (c *Client) ManualMode() bool {
-	if _, err := os.Stat(manualFlagPath); os.IsNotExist(err) {
-		if state == MANUAL {
-			c.SetState(STARTING)
-			log.Print("entering STARTING mode")
-		}
-		return false
-	}
-	if state != MANUAL {
-		c.SetState(MANUAL)
-		log.Print("entering MANUAL mode")
-	}
-	return true
+// Clean-up left-overs from previous executions
+func (s *Service) cleanUpPrevRuns() {
+	// Remove old hotspots from previous executions
+	s.cnetman.DeleteWifiConnections(netman.ApWifiConn)
 }
 
-// IsApUpWithoutSSIDs corrects an possible but unlikely case.
-// if wifiap is UP and there are no known SSIDs, bring it down so on next
-// loop iter we start again and can get SSIDs. returns true when ip is
-// UP and has no ssids
-func (c *Client) IsApUpWithoutSSIDs(cw *wifiap.Client) bool {
-	wifiUp, _ := cw.Enabled()
-	if !wifiUp {
-		return false
-	}
-	ssids, _ := utils.ReadSsidsFile()
-	if len(ssids) < 1 {
-		log.Print("wifi-ap is UP but has no SSIDS")
-		return true // ap is up with no ssids
-	}
-	return false
+// Returns true if wifi is connected to an AP
+func (s *Service) isConnectedToAnAP() bool {
+	return s.cnetman.ConnectedToAnAP(s.devicePath)
 }
 
-// ManagementServerUp starts the management server if it is
-// not running
-func (c *Client) ManagementServerUp() {
+// startManagementServer starts the management server if it is not running
+func (s *Service) startManagementServer() {
 	if server.Current != server.Management && server.State == server.Stopped {
-		err = server.StartManagementServer()
+		err := server.StartManagementServer(s.chUserEvs, s.config, &s.ssidLs)
 		if err != nil {
-			log.Printf("Error start Mamagement portal: %v", err)
+			log.Printf("Error starting Management portal: %v", err)
 		}
 		// init mDNS
-		avahi.InitMDNS()
+		//avahi.InitMDNS()
 	}
 }
 
-// ManagementServerDown stops the management server if it is running
-// also remove the wait flag file, thus resetting proper State
-func (c *Client) ManagementServerDown() {
-	if server.Current == server.Management && (server.State == server.Running || server.State == server.Starting) {
-		err = server.ShutdownManagementServer()
+// stopManagementServer stops the management server if it is running
+func (s *Service) stopManagementServer() {
+	if server.Current == server.Management && server.State == server.Running {
+		err := server.ShutdownManagementServer()
 		if err != nil {
-			log.Printf("Error stopping the Management portal: %v", err)
+			log.Printf("Error stopping Management portal: %v", err)
 		}
-		//remove flag fie so daemon resumes normal control
-		utils.RemoveFlagFile(os.Getenv("SNAP_COMMON") + "/startingApConnect")
 	}
 }
 
-// OperationalServerUp starts the operational server if it is
-// not running
-func (c *Client) OperationalServerUp() {
+// startOperationalServer starts the operational server if it is not running
+func (s *Service) startOperationalServer() {
+	if s.config.Portal.Operational == false {
+		return
+	}
+	log.Print("Starting operational server")
 	if server.Current != server.Operational && server.State == server.Stopped {
-		err = server.StartOperationalServer()
+		err := server.StartOperationalServer(s.chUserEvs, s.config)
 		if err != nil {
-			log.Printf("Error starting the Operational portal: %v", err)
+			log.Printf("Error starting Operational portal: %v", err)
 		}
 		// init mDNS
-		avahi.InitMDNS()
+		//avahi.InitMDNS()
 	}
 }
 
-// OperationalServerDown stops the operational server if it is running
-func (c *Client) OperationalServerDown() {
-	if server.Current == server.Operational && (server.State == server.Running || server.State == server.Starting) {
-		err = server.ShutdownOperationalServer()
+// stopOperationalServer stops the operational server if it is running
+func (s *Service) stopOperationalServer() {
+	if server.Current == server.Operational && server.State == server.Running {
+		err := server.ShutdownOperationalServer()
 		if err != nil {
 			log.Printf("Error stopping Operational portal: %v", err)
 		}
 	}
 }
 
-// LoadPreConfig returns a PreConfig based on the pre-config.json, if present, and an error to indicate
-// possible json unmarshal failure
-func LoadPreConfig() (*PreConfig, error) {
-	config := &PreConfig{}
-	content, err := ioutil.ReadFile(PreConfigFile)
+func (s *Service) connectToAp(ssid, pwd string) error {
+	s.exitManagingMode()
+
+	log.Printf("Trying to connect")
+	_, _, err := s.cnetman.ConnectToAp(ssid, pwd, s.devicePath)
+	if err != nil {
+		log.Printf("Failed connecting to %v: %v", ssid, err)
+		s.enterManagingMode()
+	}
+	return err
+}
+
+func (s *Service) doWifiScan() {
+	s.exitManagingMode()
+
+	// wait a bit so we get ssids when scanning
+	// TODO with a modern enough NM we could Rescan and wait for the
+	// LastScan property to be signalled. But that requires NM >= 1.12.
+	time.Sleep(waitBeforeScanSec * time.Second)
+
+	// Do some retries, just in case
+	for i := 0; i < 5; i++ {
+		ssids, _, _ := s.cnetman.Ssids(s.devicePath)
+		if len(ssids) == 0 {
+			log.Print("no ssids!!")
+			time.Sleep(waitBeforeScanSec * time.Second)
+			continue
+		}
+
+		ssidNames := make([]string, len(ssids))
+		for i, ssid := range ssids {
+			ssidNames[i] = ssid.Ssid
+		}
+		s.ssidLs.SetSsidList(ssidNames)
+		break
+	}
+
+	s.enterManagingMode()
+}
+
+func (s *Service) enterOperatingMode() {
+	s.startOperationalServer()
+}
+
+func (s *Service) exitOperatingMode() {
+	s.stopOperationalServer()
+}
+
+func (s *Service) enterManagingMode() {
+	log.Print("Entering MANAGEMENT mode")
+
+	// Remove all connections to APs that could re-connect
+	s.cnetman.DeleteWifiConnections(netman.StaWifiConn)
+	if err := s.cnetman.DisconnectDevice(s.devicePath); err != nil {
+		log.Printf("Error when disconnecting device: %v", err)
+	}
+
+	// wait a bit so we get ssids when scanning
+	// TODO with a modern enough NM we could Rescan and wait for the
+	// LastScan property to be signalled. But that requires NM >= 1.12.
+	time.Sleep(waitBeforeScanSec * time.Second)
+
+	// Do an scan of currently available SSIDs
+	ssids, _, _ := s.cnetman.Ssids(s.devicePath)
+	if len(ssids) == 0 {
+		log.Print("No SSIDs found when scanning")
+	}
+	ssidNames := make([]string, len(ssids))
+	for i, ssid := range ssids {
+		ssidNames[i] = ssid.Ssid
+	}
+	s.ssidLs.SetSsidList(ssidNames)
+
+	ip, subnet, err := net.ParseCIDR(s.config.Wifi.Subnet)
+	if err != nil {
+		log.Printf("Error while parsing %s: %v", s.config.Wifi.Subnet, err)
+		return
+	}
+	if ip.To4() == nil {
+		log.Printf("Error: %v is not an IPv4 subnet", s.config.Wifi.Subnet)
+		return
+	}
+	maskedBits, _ := subnet.Mask.Size()
+	if maskedBits > 28 {
+		log.Printf("Error: %v needs a mask smaller than 29", s.config.Wifi.Subnet)
+		return
+	}
+	apIP := ip.Mask(subnet.Mask)
+	apIP[3] |= 1
+	ipStr := apIP.String()
+
+	log.Printf("starting AP with name %s, subnet %s/%d",
+		s.config.Wifi.Ssid, ipStr, maskedBits)
+	s.apSettingsPath, s.apActiveConnPath, err =
+		s.cnetman.CreateAccessPoint(s.config.Wifi.Ssid,
+			s.config.Wifi.Passphrase, s.config.Wifi.Interface,
+			ipStr, uint(maskedBits))
+	if err != nil {
+		log.Printf("Cannot create AP: %v", err)
+		return
+	}
+
+	s.startManagementServer()
+
+	// DHCP range is X.X.X.10 - X.X.X.15
+	dhcpFirst := make(net.IP, net.IPv4len)
+	dhcpLast := make(net.IP, net.IPv4len)
+	copy(dhcpFirst, subnet.IP)
+	copy(dhcpLast, subnet.IP)
+	dhcpFirst[3] = 10
+	dhcpLast[3] = 15
+	dhcpRange := dhcpFirst.String() + "," + dhcpLast.String()
+	// Run DNS and DHCP server. The DNS will always return the interface
+	// address for any query, redirecting all request to our server.
+	// With "--user=root --group=" we get the right code path so we avoid
+	// problems when changing user/group from the snap.
+	s.dnsmasqCmd =
+		exec.Command("dnsmasq", "--conf-file", "--no-hosts",
+			"--keep-in-foreground", "--bind-interfaces",
+			"--except-interface=lo", "--clear-on-reload",
+			"--strict-order", "--listen-address="+ipStr,
+			"--dhcp-range="+dhcpRange+",60m", "--dhcp-lease-max=50",
+			"--address=/#/"+ipStr,
+			"--pid-file=/tmp/dnsmasq-wlp3s0.pid",
+			"--user=root", "--group=")
+	log.Printf("Running %v", s.dnsmasqCmd)
+	err = s.dnsmasqCmd.Start()
 	if err != nil {
-		return config, err
+		log.Fatalf("Cannot run %v: %v", s.dnsmasqCmd, err)
 	}
-	err = json.Unmarshal(content, config)
+
+	// Redirect all http to our server
+	s.iptblForwArgs = []string{"PREROUTING", "-p", "tcp", "-m", "tcp",
+		"-s", subnet.String(),
+		"--dport", "80", "-j", "DNAT",
+		"--to-destination",
+		ipStr + ":" + strconv.Itoa(s.config.Portal.Port)}
+	iptblArgs := append([]string{"-t", "nat", "-A"}, s.iptblForwArgs...)
+	iptblCmd := exec.Command("iptables", iptblArgs...)
+	log.Printf("Running %v", iptblCmd)
+	err = iptblCmd.Run()
 	if err != nil {
-		return config, err
+		log.Printf("Error running %v: %v", iptblCmd, err)
 	}
-	return config, nil
 }
 
-// SetDefaults creates the run time configuration based on wifi-ap and the pre-config.json
-// configuration file, if any. The configuration is returned with an error.
-func (c *Client) SetDefaults(cw wifiap.Operations, config *PreConfig) error {
+func (s *Service) exitManagingMode() {
+	log.Printf("Exiting MANAGEMENT mode")
+
+	if s.dnsmasqCmd != nil {
+		log.Printf("Stopping dnsmasq")
+		s.dnsmasqCmd.Process.Signal(syscall.SIGTERM)
+		s.dnsmasqCmd.Process.Wait()
+		s.dnsmasqCmd = nil
+	}
+
+	// Remove http redirection
+	iptblArgs := append([]string{"-t", "nat", "-D"}, s.iptblForwArgs...)
+	iptblCmd := exec.Command("iptables", iptblArgs...)
+	log.Printf("Running %v", iptblCmd)
+	err := iptblCmd.Run()
 	if err != nil {
-		log.Printf("SetDefaults: preconfig unmarshall errorr: %v", err)
-	}
-	ap, errShow := cw.Show()
-	if errShow != nil {
-		log.Printf("SetDefaults: wifi-ap.Show err: %v", errShow)
-	}
-	if ap["wifi.security-passphrase"] != config.Passphrase {
-		if len(config.Passphrase) > 0 {
-			err = cw.SetPassphrase(config.Passphrase)
-			log.Print("SetDefaults wifi-ap passphrase being set")
-			if err != nil {
-				log.Printf("SetDefaults: passphrase err: %v", err)
-				return err
-			}
-		}
+		log.Printf("Error running %v: %v", iptblCmd, err)
 	}
-	if len(config.Password) > 0 {
-		fmt.Println("== wifi-connect/SetDefaults portal password being set")
-		_, err = utils.HashIt(config.Password)
-		if err != nil {
-			log.Printf("SetDefaults: password err: %v", err)
-			return err
+
+	s.cnetman.DeleteWifiConnections(netman.ApWifiConn)
+	if err := s.cnetman.DisconnectDevice(s.devicePath); err != nil {
+		log.Printf("Error when disconnecting device: %v", err)
+	}
+
+	s.stopManagementServer()
+}
+
+// event: NM is up event received
+func (s *Service) netManUpEv(current serviceState) serviceState {
+	log.Printf("NetworkManager is up")
+	if current != stStarting {
+		// Spurious signal?
+		return current
+	}
+
+	err := s.setDefaults()
+	if err != nil {
+		log.Printf("setDefaults error: %v", err)
+	}
+	s.cleanUpPrevRuns()
+
+	var state serviceState
+	if s.config.ConfigWifiOnce &&
+		utils.FlagFileExists(utils.WifiConfigDoneFlagFile) {
+		state = stOperating
+		s.enterOperatingMode()
+	} else {
+		// Wait some time on first run to let the wifi connect
+		// TODO wait for DBus signal instead
+		time.Sleep(10 * time.Second)
+		if s.isConnectedToAnAP() {
+			state = stOperating
+			s.enterOperatingMode()
+		} else {
+			state = stManaging
+			s.enterManagingMode()
 		}
 	}
-	if config.Operational {
-		log.Print("SetDefaults: operational portal is enabled")
+	return state
+}
+
+func (s *Service) stopServices(state serviceState) {
+	switch state {
+	case stManaging:
+		s.exitManagingMode()
+	case stOperating:
+		s.exitOperatingMode()
+	}
+}
+
+// event: NM is down event received
+func (s *Service) netManDownEv(current serviceState) serviceState {
+	log.Printf("NetworkManager is down")
+	s.stopServices(current)
+	return stStarting
+}
+
+// event: user sends command to connect
+func (s *Service) userConnectEv(current serviceState,
+	ssid, password string) serviceState {
+
+	if current != stManaging {
+		log.Printf("Connect event, but not in managing mode")
+		return current
+	}
+
+	// connectToAp exits managing mode on success
+	err := s.connectToAp(ssid, password)
+	if err != nil {
+		log.Printf("Failed to connect: %v", err)
+		return current
 	}
-	if config.NoResetCreds {
-		log.Print("SetDefaults: reset creds requirement is disabled")
+
+	utils.WriteFlagFile(utils.WifiConfigDoneFlagFile)
+	s.enterOperatingMode()
+
+	return stOperating
+}
+
+// event: user sends command to refresh wifi list
+func (s *Service) userRefreshEv(current serviceState) {
+	if current != stManaging {
+		log.Printf("Refresh event, but not in managing mode")
 	}
-	return nil
+
+	s.doWifiScan()
+}
+
+// event: user sends command to disconnect
+func (s *Service) userDisconnectEv(current serviceState) serviceState {
+	if current != stOperating {
+		log.Printf("Disconnect event, but not in operating mode")
+		return current
+	}
+
+	s.exitOperatingMode()
+	utils.RemoveFlagFile(utils.WifiConfigDoneFlagFile)
+	s.enterManagingMode()
+
+	return stManaging
+}
+
+// Start state machine
+func (s *Service) Start() {
+
+	chDbus := make(chan *dbus.Signal, 30)
+	defer close(chDbus)
+	if err := s.cnetman.RegisterForNameOwnerChanged(chDbus); err != nil {
+		log.Printf("Error: cannot register for NameOwnerChanged: %v", err)
+		os.Exit(1)
+	}
+	defer s.cnetman.UnregisterForNameOwnerChanged(chDbus)
+
+	state := stStarting
+	nmUp, err := s.cnetman.CheckNetworkManagerRunning()
+	if nmUp == false {
+		log.Printf("Waiting for NetworkManager service: %v", err)
+	} else {
+		state = s.netManUpEv(state)
+	}
+	spuriousSignal := false
+
+MainLoop:
+	for {
+		if spuriousSignal == false {
+			log.Printf("State is %v", state)
+		} else {
+			spuriousSignal = false
+		}
+		select {
+		case uEv := <-s.chUserEvs:
+			log.Print("Event received: ", uEv.EvType)
+			switch uEv.EvType {
+			case server.UserEventConnect:
+				state = s.userConnectEv(state,
+					uEv.Params[server.UeConnSsid],
+					uEv.Params[server.UeConnPassword])
+			case server.UserEventRefresh:
+				s.userRefreshEv(state)
+			case server.UserEventDisconnect:
+				state = s.userDisconnectEv(state)
+			}
+		case sig := <-s.chSigs:
+			log.Printf("Exiting on %v signal", sig)
+			break MainLoop
+		case dbusSig := <-chDbus:
+			if dbusSig.Name == "org.freedesktop.DBus.NameOwnerChanged" &&
+				dbusSig.Body[0].(string) == "org.freedesktop.NetworkManager" {
+				// Check if there is a current owner
+				if dbusSig.Body[2].(string) == "" {
+					state = s.netManDownEv(state)
+				} else {
+					state = s.netManUpEv(state)
+				}
+			} else {
+				// We do not want to print the state for signals
+				// that we are not interested in...
+				spuriousSignal = true
+			}
+		}
+	}
+
+	s.stopServices(state)
 }
diff --git a/daemon/daemon_test.go b/daemon/daemon_test.go
index 07fe109..2af53e8 100644
--- a/daemon/daemon_test.go
+++ b/daemon/daemon_test.go
@@ -18,225 +18,13 @@
 package daemon
 
 import (
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"strings"
 	"testing"
-
-	"launchpad.net/wifi-connect/utils"
 )
 
-func TestManualFlagPath(t *testing.T) {
-	mfpInit := "mfp"
-	client := GetClient()
-	client.SetManualFlagPath(mfpInit)
-	mfp := client.GetManualFlagPath()
-	if mfp != mfpInit {
-		t.Errorf("ManualFlag path should be %s but is %s\n", mfpInit, mfp)
-	}
-}
-
-func TestWaitFlagPath(t *testing.T) {
-	wfpInit := "wfp"
-	client := GetClient()
-	client.SetWaitFlagPath(wfpInit)
-	wfp := client.GetWaitFlagPath()
-	if wfp != wfpInit {
-		t.Errorf("WaitFlag path should be %s but is %s", wfp, wfpInit)
-	}
-}
-
-func TestState(t *testing.T) {
-	client := GetClient()
-	client.SetState(MANAGING)
-	client.SetPreviousState(STARTING)
-	ps := client.GetPreviousState()
-	if ps != STARTING {
-		t.Errorf("Previous state should be %d but is %d", STARTING, ps)
-	}
-	s := client.GetState()
-	if s != MANAGING {
-		t.Errorf("State should be %d but is %d", MANAGING, s)
-	}
-}
-
-func TestCheckWaitApConnect(t *testing.T) {
-	client := GetClient()
-	wfp := "thispathnevershouldexist"
-	client.SetWaitFlagPath(wfp)
-	if client.CheckWaitApConnect() {
-		t.Errorf("CheckWaitApConnect returns true but should return false")
-	}
-	wfp = "../static/tests/waitFile"
-	client.SetWaitFlagPath(wfp)
-	if !client.CheckWaitApConnect() {
-		t.Errorf("CheckWaitApConnect returns false but should return true")
-	}
-}
-
-func TestManualMode(t *testing.T) {
-	mfp := "thisfileshouldneverexist"
-	client := GetClient()
-	client.SetManualFlagPath(mfp)
-	client.SetState(MANUAL)
-	if client.ManualMode() {
-		t.Errorf("ManualMode returns true but should return false")
-	}
-	if client.GetState() != STARTING {
-		t.Errorf("ManualMode should set state to STARTING when not in manual mode but does not")
-	}
-	mfp = "../static/tests/manualMode"
-	client.SetManualFlagPath(mfp)
-	client.SetState(STARTING)
-	if !client.ManualMode() {
-		t.Errorf("ManualMode returns false but should return true")
-	}
-	if client.GetState() != MANUAL {
-		t.Errorf("ManualMode should set state to MANUAL when in manual mode but does not")
-	}
-}
-
-type mockWifiap struct{}
-
-func (mock *mockWifiap) Do(req *http.Request) (*http.Response, error) {
-	fmt.Println("==== MY do called")
-	url := req.URL.String()
-	if url != "http://unix/v1/configuration" {
-		return nil, fmt.Errorf("Not valid request URL: %v", url)
-	}
-
-	if req.Method != "GET" {
-		return nil, fmt.Errorf("Method is not valid. Expected GET, got %v", req.Method)
-	}
-
-	rawBody := `{"result":{
-		"debug":false, 
-		"dhcp.lease-time": "12h", 
-		"dhcp.range-start": "10.0.60.2", 
-		"dhcp.range-stop": "10.0.60.199", 
-		"disabled": true, 
-		"share.disabled": false, 
-		"share-network-interface": "tun0", 
-		"wifi-address": "10.0.60.1", 
-		"wifi.channel": "6", 
-		"wifi.hostapd-driver": "nl80211", 
-		"wifi.interface": "wlan0", 
-		"wifi.interface-mode": "direct", 
-		"wifi.netmask": "255.255.255.0", 
-		"wifi.operation-mode": "g", 
-		"wifi.security": "
-		"wifi.security-passphrase": "passphrase123", 
-		"wifi.ssid": "AP"},"status":"OK","status-code":200,""sync"}`
-
-	response := http.Response{
-		StatusCode: 200,
-		Status:     "200 OK",
-		Body:       ioutil.NopCloser(strings.NewReader(rawBody)),
-	}
-
-	return &response, nil
-}
-
-func (mock *mockWifiap) Show() (map[string]interface{}, error) {
-	wifiAp := make(map[string]interface{})
-	wifiAp["wifi.security-passphrase"] = "randompassphrase"
-	return wifiAp, nil
-}
-
-func (mock *mockWifiap) Enabled() (bool, error) {
-	return true, nil
-}
-
-func (mock *mockWifiap) Enable() error {
-	return nil
-}
-func (mock *mockWifiap) Disable() error {
-	return nil
-}
-func (mock *mockWifiap) SetSsid(s string) error {
-	return nil
-}
-
-func (mock *mockWifiap) SetPassphrase(p string) error {
-	return nil
-}
-
-func (mock *mockWifiap) Set(map[string]interface{}) error {
-	return nil
-}
-
-func TestLoadPreConfig(t *testing.T) {
-	PreConfigFile = "../static/tests/pre-config0.json"
-	config, err := LoadPreConfig()
-	if err != nil {
-		t.Errorf("Unexpected error using LoadPreConfig: %s", err)
-	}
-	if config.Passphrase != "abcdefghijklmnop" {
-		t.Errorf("Passphrase of %s expected but got %s:", "abcdefghijklmnop", config.Passphrase)
-	}
-	if !config.Operational {
-		t.Errorf("portal.operational was set to false but the loaded config is %t", config.Operational)
-	}
-	if !config.NoResetCreds {
-		t.Errorf("portal.no-reset-creds was set to true but the loaded config is %t", config.NoResetCreds)
-	}
-
-}
-
-func TestSetDefaults(t *testing.T) {
-	client := GetClient()
-	PreConfigFile = "../static/tests/pre-config0.json"
-	hfp := "/tmp/hash"
-	if _, err := os.Stat(hfp); err == nil {
-		err = os.Remove(hfp)
-		if err != nil {
-			t.Errorf("Could not remove previous file version")
-		}
-	}
-	config, _ := LoadPreConfig()
-	utils.SetHashFile(hfp)
-	client.SetDefaults(&mockWifiap{}, config)
-	expectedPassphrase := "abcdefghijklmnop"
-	expectedPassword := "qwerzxcv"
-	if config.Passphrase != expectedPassphrase {
-		t.Errorf("SetDefaults: Preconfig passphrase should be %s but is %s", expectedPassphrase, config.Passphrase)
-	}
-	if os.IsNotExist(err) {
-		t.Errorf("SetDefaults should have created %s but did not", hfp)
-	}
-	res, _ := utils.MatchingHash(expectedPassword)
-	if !res {
-		t.Errorf("SetDefaults: Preconfig password hash did not match actual")
-	}
-	if !config.Operational {
-		t.Errorf("SetDefaults: Preconfig portal.operational should be true (set) but is %t", config.Operational)
-	}
-	if !config.NoResetCreds {
-		t.Errorf("SetDefaults: Preconfig portal.no-reset-creds should be true (set) but is %t", config.NoResetCreds)
-	}
-
-	if _, err := os.Stat(hfp); err == nil {
-		err = os.Remove(hfp)
-		if err != nil {
-			t.Errorf("Could not remove previous file version")
-		}
-	}
-	PreConfigFile = "../static/tests/pre-config1.json"
-	config, _ = LoadPreConfig()
-	client.SetDefaults(&mockWifiap{}, config)
-	if len(config.Passphrase) > 0 {
-		t.Errorf("SetDefaults: Preconfig passphrase was not set but is %s", config.Passphrase)
-	}
-	res2, _ := utils.MatchingHash(expectedPassword)
-	if res2 {
-		t.Errorf("SetDefaults: Preconfig password was not set, but the hash matched")
-	}
-	if config.Operational {
-		t.Errorf("SetDefaults: Preconfig portal.no-operational should be false (unset) but is %t", config.Operational)
-	}
-	if config.NoResetCreds {
-		t.Errorf("SetDefaults: Preconfig portal.no-reset-creds should be false (unnset) but is %t", config.NoResetCreds)
-	}
+func TestGetService(t *testing.T) {
+	// cfg := utils.Config{Wifi: utils.WifiConfig{Ssid: "myssid"}, ConfigWifiOnce: false}
+	// service := GetService(&cfg)
+	// if service == nil {
+	// 	t.Error("Cannot get service")
+	// }
 }
diff --git a/dependencies.tsv b/dependencies.tsv
index e5f04d8..e9c02fa 100644
--- a/dependencies.tsv
+++ b/dependencies.tsv
@@ -1,7 +1,7 @@
-github.com/go-yaml/yaml	git	cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b	2017-04-07T18:21:22Z
-github.com/godbus/dbus	git	fe0e1d54eaeda11a9979659a8d32f459e88bee75	2017-03-03T19:03:06Z
-github.com/gorilla/context	git	08b5f424b9271eedf6f9f0ce86cb9396ed337a42	2016-08-17T18:46:32Z
-github.com/gorilla/mux	git	757bef944d0f21880861c2dd9c871ca543023cba	2016-09-20T23:08:13Z
+github.com/godbus/dbus	git	06fc4b473149e499166adbb9e31c7365a8ea146f	2020-02-14T23:16:04Z
+github.com/gorilla/mux	git	75dcda0896e109a2a22c9315bca3bb21b87b2ba5	2020-01-12T19:17:43Z
+golang.org/x/crypto	git	8b5121be2f68d8fc40bb06467003bdde1040a094	2020-01-24T22:56:46Z
+golang.org/x/net	git	13f9640d40b9cc418fb53703dfbd177679788ceb	2019-10-04T11:05:52Z
+golang.org/x/text	git	342b2e1fbaa52c93f31447ad2c6abc048c63e475	2019-04-25T21:42:06Z
 github.com/presotto/go-mdns-sd	git	343772046ec1b3840b8591799a7bbcc68ea47b4b	2015-11-03T06:16:58Z
-github.com/reiver/go-oi	git	431c83978379297f04f85f6eb94f129f25ab741d	2016-03-25T06:16:15Z
-github.com/reiver/go-telnet	git	6b696f32801a8f8dd07947f1e1fdb1a7dc4766ff	2016-03-30T05:09:16Z
+gopkg.in/check.v1	git	4f90aeace3a26ad7021961c297b22c42160c7b25	2016-01-05T16:49:36Z
diff --git a/hooks/configure.go b/hooks/configure.go
index 80cfe91..7775eab 100644
--- a/hooks/configure.go
+++ b/hooks/configure.go
@@ -20,15 +20,14 @@
 package main
 
 import (
-	"encoding/json"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"time"
 
-	"launchpad.net/wifi-connect/daemon"
+	"launchpad.net/wifi-connect/utils"
 )
 
 // logFile is the file into which log msgs go. Needed because snap hook stdout
@@ -65,7 +64,6 @@ func (g *Get) SnapGet(key string) (string, error) {
 		return "", err
 	}
 	return strings.TrimSpace(string(out)), nil
-
 }
 
 // snapGetStr wraps SnapGet for string types and verifies the snap var is valid
@@ -75,12 +73,28 @@ func (c *Client) snapGetStr(key string, target *string) {
 		return
 	}
 	if len(val) == 0 {
-		log("configure error: key %s exists but has zero length" + key)
+		log("configure error: key " + key + " exists but has zero length")
 		return
 	}
 	*target = val
 }
 
+func (c *Client) snapGetInt(key string, target *int) {
+	val, err := c.getter.SnapGet(key)
+	if err != nil {
+		return
+	}
+	if len(val) == 0 {
+		log("configure error: key " + key + " exists but has zero length")
+		return
+	}
+	*target, err = strconv.Atoi(val)
+	if err != nil {
+		log("bad integer: " + err.Error())
+		*target = 0
+	}
+}
+
 // snapGetBool wraps SnapGet for bool types and verifies the snap var is valid
 func (c *Client) snapGetBool(key string, target *bool) {
 	val, err := c.getter.SnapGet(key)
@@ -88,7 +102,7 @@ func (c *Client) snapGetBool(key string, target *bool) {
 		return
 	}
 	if len(val) == 0 {
-		log("configure error: key %s exists but has zero length" + key)
+		log("configure error: key " + key + " exists but has zero length")
 		return
 	}
 
@@ -109,20 +123,28 @@ func log(msg string) {
 func main() {
 	log("Configure hook running")
 	client := GetClient()
-	preConfig := &daemon.PreConfig{}
-	client.snapGetStr("wifi.security-passphrase", &preConfig.Passphrase)
-	client.snapGetStr("portal.password", &preConfig.Password)
-	client.snapGetBool("portal.operational", &preConfig.Operational)
-	client.snapGetBool("portal.no-reset-creds", &preConfig.NoResetCreds)
 
-	b, err := json.Marshal(preConfig)
-	if err != nil {
-		log("Marshall error: " + err.Error())
-		return
-	}
+	config, _ := utils.LoadConfig()
+
+	client.snapGetBool("config-wifi-once", &config.ConfigWifiOnce)
+
+	client.snapGetStr("wifi.ssid", &config.Wifi.Ssid)
+	client.snapGetStr("wifi.security-passphrase", &config.Wifi.Passphrase)
+	client.snapGetStr("wifi.interface", &config.Wifi.Interface)
+	client.snapGetStr("wifi.country-code", &config.Wifi.CountryCode)
+	client.snapGetInt("wifi.channel", &config.Wifi.Channel)
+	client.snapGetStr("wifi.operation-mode", &config.Wifi.OperationMode)
+	client.snapGetStr("wifi.subnet", &config.Wifi.Subnet)
+
+	client.snapGetStr("portal.password", &config.Portal.Password)
+	client.snapGetInt("portal.port", &config.Portal.Port)
+	client.snapGetBool("portal.no-reset-creds", &config.Portal.NoResetCredentials)
+	client.snapGetBool("portal.operational", &config.Portal.Operational)
+
+	utils.WriteConfigFile(config)
 
-	err = ioutil.WriteFile(daemon.PreConfigFile, b, 0644)
+	err := exec.Command("snapctl", "restart", os.Getenv("SNAP_NAME")).Run()
 	if err != nil {
-		log("configure hook: " + err.Error())
+		log("Error while re-starting the service: " + err.Error())
 	}
 }
diff --git a/netman/dbus.go b/netman/dbus.go
index 55564bd..b6ce186 100644
--- a/netman/dbus.go
+++ b/netman/dbus.go
@@ -20,31 +20,45 @@ package netman
 import (
 	"errors"
 	"fmt"
-	"io"
 	"log"
-	"os"
 	"strings"
 	"time"
 
 	"github.com/godbus/dbus"
 )
 
+// WifiConnType enum for types of wifi connections
+type WifiConnType int
+
+// All wifi conns, just STA or just AP
+const (
+	AllWifiConn WifiConnType = iota
+	StaWifiConn
+	ApWifiConn
+)
+
 // Operations defines operations for this package client
 type Operations interface {
 	GetDevices() []string
-	GetWifiDevices(devices []string) []string
+	GetWifiDevices() []string
+	GetIfaceFromDevicePath(connSettPath string) (string, error)
+	GetDevicePathFromIface(iface string) (string, error)
 	GetAccessPoints(devices []string, ap2device map[string]string) []string
-	ConnectAp(ssid string, p string, ap2device map[string]string, ssid2ap map[string]string) error
-	Ssids() ([]SSID, map[string]string, map[string]string)
+	ConnectToAp(ssid, password, device string) (string, string, error)
+	Ssids(devicePath string) ([]SSID, map[string]string, map[string]string)
 	Connected(devices []string) bool
-	ConnectedWifi(wifiDevices []string) bool
-	DeleteWifiConnections()
+	ConnectedToAnAP(wifiDevice string) bool
+	DisconnectDevice(device string) error
+	DeleteWifiConnection(connSett string) error
+	DeleteWifiConnections(wifiType int)
 	DisconnectWifi(wifiDevices []string) int
 	SetIfaceManaged(iface string, state bool, devices []string) string
 	WifisManaged(wifiDevices []string) (map[string]string, error)
-	Unmanage() error
-	Manage() error
-	ScanAndWriteSsidsToFile(filepath string) bool
+	Unmanage(wifiIface string) error
+	Manage(wifiIface string) error
+	CreateAccessPoint(ssid string, password string, wifiPath string,
+		ipAddress string, prefix uint) (string, string, error)
+	ActivateConnection(devicePath string, connPath string) (string, error)
 }
 
 // Client type to support unit test mock and runtime execution
@@ -64,16 +78,20 @@ type Objecter interface {
 	Object(dest string, path dbus.ObjectPath) dbus.BusObject
 }
 
-// Object is the mock implementation of the godbus Object function
-func (d *DbusClient) Object(dest string, path dbus.ObjectPath) dbus.BusObject {
-	obj := d.Connection.Object(dest, path)
-	return obj
+func getSystemBus() *dbus.Conn {
+	conn, err := dbus.SystemBus()
+	if err != nil {
+		log.Printf("Error: Failed to connect to system bus: %v", err)
+		panic(1)
+	}
+	return conn
 }
 
 // DefaultClient is the runtime client object
 func DefaultClient() *Client {
 	conn := getSystemBus()
-	obj := conn.Object("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager")
+	obj := conn.Object("org.freedesktop.NetworkManager",
+		"/org/freedesktop/NetworkManager")
 	return &Client{
 		dbusClient: DbusClient{
 			test:       false,
@@ -102,13 +120,10 @@ func setObject(c *Client, iface string, path dbus.ObjectPath) {
 
 // GetDevices returns NetMan (NetworkManager) devices
 func (c *Client) GetDevices() []string {
-	if !c.dbusClient.test {
-		c.dbusClient.Connection = getSystemBus()
-	}
-	c.dbusClient.Object("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager")
 	setObject(c, "org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager")
 	var devices []string
-	err := c.dbusClient.BusObj.Call("org.freedesktop.NetworkManager.GetAllDevices", 0).Store(&devices)
+	err := c.dbusClient.BusObj.Call(
+		"org.freedesktop.NetworkManager.GetAllDevices", 0).Store(&devices)
 	if err != nil {
 		log.Printf("Error getting devices: %v", err)
 	}
@@ -116,22 +131,20 @@ func (c *Client) GetDevices() []string {
 }
 
 // GetWifiDevices returns wifi NetMan devices
-func (c *Client) GetWifiDevices(devices []string) []string {
+func (c *Client) GetWifiDevices() []string {
+	devices := c.GetDevices()
 	var wifiDevices []string
 	for _, d := range devices {
 		objPath := dbus.ObjectPath(d)
-		c.dbusClient.Object("org.freedesktop.NetworkManager", objPath)
 		setObject(c, "org.freedesktop.NetworkManager", objPath)
-		deviceType, err2 := c.dbusClient.BusObj.GetProperty("org.freedesktop.NetworkManager.Device.DeviceType")
-		if err2 != nil {
-			log.Printf("Error getting wifi devices: %v", err2)
+		deviceType, err := c.dbusClient.BusObj.GetProperty(
+			"org.freedesktop.NetworkManager.Device.DeviceType")
+		if err != nil {
+			log.Printf("Error getting DeviceType: %v", err)
 			continue
 		}
 		var wifiType uint32
 		wifiType = 2
-		if deviceType.Value() == nil {
-			break
-		}
 		if deviceType.Value() != wifiType {
 			continue
 		}
@@ -140,15 +153,52 @@ func (c *Client) GetWifiDevices(devices []string) []string {
 	return wifiDevices
 }
 
-//GetAccessPoints returns NetMan known external APs
+// GetIfaceFromDevicePath gets interface name from NM's dbus device path
+func (c *Client) GetIfaceFromDevicePath(connSettPath string) (string, error) {
+	setObject(c, "org.freedesktop.NetworkManager",
+		dbus.ObjectPath(connSettPath))
+	iface, err := c.dbusClient.BusObj.GetProperty(
+		"org.freedesktop.NetworkManager.Device.Interface")
+	if err != nil {
+		return "", err
+	}
+	return iface.Value().(string), err
+}
+
+// GetDevicePathFromIface gets NM's DBus object path for a device from the interface name
+func (c *Client) GetDevicePathFromIface(iface string) (string, error) {
+	devPaths := c.GetDevices()
+	matchDevPath := ""
+	for _, devPath := range devPaths {
+		setObject(c, "org.freedesktop.NetworkManager",
+			dbus.ObjectPath(devPath))
+		devIface, err := c.dbusClient.BusObj.GetProperty(
+			"org.freedesktop.NetworkManager.Device.Interface")
+		if err != nil {
+			log.Printf("Error getting wifi devices: %v", err)
+			continue
+		}
+		if devIface.Value().(string) == iface {
+			matchDevPath = devPath
+			break
+		}
+	}
+	if matchDevPath == "" {
+		return "", errors.New("Interface not found")
+	}
+	return matchDevPath, nil
+}
+
+// GetAccessPoints returns NetMan known external APs
 func (c *Client) GetAccessPoints(devices []string, ap2device map[string]string) []string {
 	var APs []string
 	for _, d := range devices {
 		var aps []string
 		objPath := dbus.ObjectPath(d)
-		c.dbusClient.Object("org.freedesktop.NetworkManager", objPath)
 		setObject(c, "org.freedesktop.NetworkManager", objPath)
-		err := c.dbusClient.BusObj.Call("org.freedesktop.NetworkManager.Device.Wireless.GetAllAccessPoints", 0).Store(&aps)
+		err := c.dbusClient.BusObj.Call("org.freedesktop."+
+			"NetworkManager.Device.Wireless.GetAllAccessPoints",
+			0).Store(&aps)
 		if err != nil {
 			log.Printf("Error getting accesspoints: %v", err)
 			continue
@@ -175,9 +225,9 @@ func (c *Client) getSsids(APs []string, ssid2ap map[string]string) []SSID {
 	var SSIDs []SSID
 	for _, ap := range APs {
 		objPath := dbus.ObjectPath(ap)
-		c.dbusClient.Object("org.freedesktop.NetworkManager", objPath)
 		setObject(c, "org.freedesktop.NetworkManager", objPath)
-		ssid, err := c.dbusClient.BusObj.GetProperty("org.freedesktop.NetworkManager.AccessPoint.Ssid")
+		ssid, err := c.dbusClient.BusObj.GetProperty(
+			"org.freedesktop.NetworkManager.AccessPoint.Ssid")
 		if err != nil {
 			log.Printf("Error getting accesspoint's ssids: %v", err)
 			continue
@@ -196,60 +246,43 @@ func (c *Client) getSsids(APs []string, ssid2ap map[string]string) []SSID {
 		Ssid := SSID{Ssid: ssidStr, ApPath: ap}
 		SSIDs = append(SSIDs, Ssid)
 		ssid2ap[strings.TrimSpace(ssidStr)] = ap
-		//TODO: exclude ssid of device's own AP (the wifi-ap one)
 	}
 	return SSIDs
 }
 
-// ConnectAp attempts to Connect to an external AP
-func (c *Client) ConnectAp(ssid string, p string, ap2device map[string]string, ssid2ap map[string]string) error {
-	inner1 := make(map[string]dbus.Variant)
-	inner1["security"] = dbus.MakeVariant("802-11-wireless-security")
-
-	inner2 := make(map[string]dbus.Variant)
-	inner2["key-mgmt"] = dbus.MakeVariant("wpa-psk")
-	inner2["psk"] = dbus.MakeVariant(p)
+// ConnectToAp attempts to connect to an external AP
+func (c *Client) ConnectToAp(ssid, password, device string) (string, string, error) {
 
-	outer := make(map[string]map[string]dbus.Variant)
-	outer["802-11-wireless"] = inner1
-	outer["802-11-wireless-security"] = inner2
+	wirelessSett := make(map[string]dbus.Variant)
+	wirelessSett["ssid"] = dbus.MakeVariant([]byte(ssid))
 
-	c.dbusClient.Object("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager")
-	setObject(c, "org.freedesktop.NetworkManager", dbus.ObjectPath("/org/freedesktop/NetworkManager"))
-	c.dbusClient.BusObj.Call("org.freedesktop.NetworkManager.AddAndActivateConnection", 0, outer, dbus.ObjectPath(ap2device[ssid2ap[ssid]]), dbus.ObjectPath(ssid2ap[ssid]))
+	wirelessSecSett := make(map[string]dbus.Variant)
+	wirelessSecSett["key-mgmt"] = dbus.MakeVariant("wpa-psk")
+	wirelessSecSett["psk"] = dbus.MakeVariant(password)
 
-	// loop until connected or until max loops
-	trying := true
-	idx := -1
-	for trying {
-		idx++
-		time.Sleep(1000 * time.Millisecond)
-		if c.Connected(c.GetWifiDevices(c.GetDevices())) {
-			return nil
-		}
-		if idx == 19 {
-			return errors.New("wifi-connect: cannot connect to AP")
-		}
-	}
-	return nil
-}
+	settings := make(map[string]map[string]dbus.Variant)
+	settings["802-11-wireless"] = wirelessSett
+	settings["802-11-wireless-security"] = wirelessSecSett
 
-func getSystemBus() *dbus.Conn {
-	conn, err := dbus.SystemBus()
+	setObject(c, "org.freedesktop.NetworkManager",
+		dbus.ObjectPath("/org/freedesktop/NetworkManager"))
+	var connPath, actConnPath string
+	err := c.dbusClient.BusObj.Call(
+		"org.freedesktop.NetworkManager.AddAndActivateConnection",
+		0, settings, dbus.ObjectPath(device),
+		dbus.ObjectPath("/")).Store(&connPath, &actConnPath)
 	if err != nil {
-		log.Printf("Error: Failed to connect to system bus: %v", err)
-		panic(1)
+		return "", "", err
 	}
-	return conn
+
+	return connPath, actConnPath, c.WaitConnectionActivated(actConnPath)
 }
 
 // Ssids returns known SSIDs
-func (c *Client) Ssids() ([]SSID, map[string]string, map[string]string) {
+func (c *Client) Ssids(devicePath string) ([]SSID, map[string]string, map[string]string) {
 	ap2device := make(map[string]string)
 	ssid2ap := make(map[string]string)
-	devices := c.GetDevices()
-	wifiDevices := c.GetWifiDevices(devices)
-	APs := c.GetAccessPoints(wifiDevices, ap2device)
+	APs := c.GetAccessPoints([]string{devicePath}, ap2device)
 	SSIDs := c.getSsids(APs, ssid2ap)
 	return SSIDs, ap2device, ssid2ap
 }
@@ -258,20 +291,22 @@ func (c *Client) Ssids() ([]SSID, map[string]string, map[string]string) {
 func (c *Client) Connected(devices []string) bool {
 	for _, d := range devices {
 		objPath := dbus.ObjectPath(d)
-		c.dbusClient.Object("org.freedesktop.NetworkManager", objPath)
 		setObject(c, "org.freedesktop.NetworkManager", objPath)
-		dType, err := c.dbusClient.BusObj.GetProperty("org.freedesktop.NetworkManager.Device.DeviceType")
+		dType, err := c.dbusClient.BusObj.
+			GetProperty("org.freedesktop.NetworkManager.Device.DeviceType")
 		if err != nil {
 			log.Printf("Error getting device type: %v", err)
 			continue
 		}
-		state, err2 := c.dbusClient.BusObj.GetProperty("org.freedesktop.NetworkManager.Device.State")
+		state, err2 := c.dbusClient.BusObj.
+			GetProperty("org.freedesktop.NetworkManager.Device.State")
 		if err2 != nil {
 			log.Printf("Error getting device state: %v", err2)
 			continue
 		}
 		// only handle eth and wifi device type
-		if dbus.Variant.Value(dType) != uint32(1) && dbus.Variant.Value(dType) != uint32(2) {
+		if dbus.Variant.Value(dType) != uint32(1) &&
+			dbus.Variant.Value(dType) != uint32(2) {
 			continue
 		}
 		if dbus.Variant.Value(state) == uint32(100) {
@@ -281,75 +316,180 @@ func (c *Client) Connected(devices []string) bool {
 	return false
 }
 
-// ConnectedWifi checks if any passed wifi devices are connected
-func (c *Client) ConnectedWifi(wifiDevices []string) bool {
-	for _, d := range wifiDevices {
-		objPath := dbus.ObjectPath(d)
-		c.dbusClient.Object("org.freedesktop.NetworkManager", objPath)
-		setObject(c, "org.freedesktop.NetworkManager", objPath)
-		state, err := c.dbusClient.BusObj.GetProperty("org.freedesktop.NetworkManager.Device.State")
-		if err != nil {
-			log.Printf("Error getting device state: %v", err)
-			continue
-		}
-		if dbus.Variant.Value(state) == uint32(100) {
-			return true
-		}
+// ConnectedToAnAP checks if the passed device is connected to an AP. If the
+// device is itself an AP, we do not consider that a connection.
+func (c *Client) ConnectedToAnAP(wifiDevice string) bool {
+	objPath := dbus.ObjectPath(wifiDevice)
+	setObject(c, "org.freedesktop.NetworkManager", objPath)
+
+	// GetAppliedConnection will return the current active
+	// connection for the device, or nothing if the device is not
+	// active. Checking for existence of "802-11-wireless" will
+	// rule out both non-wifi and non-active wifi devices.
+	settings := make(map[string]interface{})
+	var connID uint64
+	c.dbusClient.BusObj.Call("org.freedesktop.NetworkManager."+
+		"Device.GetAppliedConnection", 0, uint32(0)).
+		Store(&settings, &connID)
+	wifiSett, ok := settings["802-11-wireless"].(map[string]interface{})
+	if !ok {
+		return false
 	}
-	return false
+	// If mode is not set, it is infrastructure mode
+	mode, ok := wifiSett["mode"].(string)
+	if !ok {
+		return true
+	}
+	if mode == "ap" {
+		// We ARE an AP, so not connected to one
+		return false
+	}
+	return true
+}
+
+// DeleteWifiConnection deletes a wifi connection using the object path to the
+// connetion settings TODO wait for Removed signal?
+func (c *Client) DeleteWifiConnection(connSett string) error {
+	setObject(c, "org.freedesktop.NetworkManager",
+		dbus.ObjectPath(connSett))
+
+	call := c.dbusClient.BusObj.Call(
+		"org.freedesktop.NetworkManager.Settings.Connection.Delete", 0)
+	return call.Err
 }
 
-// DeleteWifiConnections deletes all wifi connections (type 802-11-wireless)
-func (c *Client) DeleteWifiConnections() {
+// DeleteWifiConnections deletes all wifi connections for a given type
+func (c *Client) DeleteWifiConnections(wifiType WifiConnType) {
 	objPath := dbus.ObjectPath("/org/freedesktop/NetworkManager/Settings")
-	c.dbusClient.Object("org.freedesktop.NetworkManager", objPath)
 	setObject(c, "org.freedesktop.NetworkManager", objPath)
 
-	//connect all connections
+	// get all connections
 	var conns []string
-	err := c.dbusClient.BusObj.Call("org.freedesktop.NetworkManager.Settings.ListConnections", 0).Store(&conns)
+	err := c.dbusClient.BusObj.Call(
+		"org.freedesktop.NetworkManager.Settings.ListConnections", 0).
+		Store(&conns)
 	if err != nil {
 		log.Printf("Error getting connections: %v", err)
 	}
 
-	//Delete all 802-11-wireless connections to clean netman cruft
+	// Delete 802-11-wireless connections for the given type
 	for _, conn := range conns {
 		objPath := dbus.ObjectPath(conn)
-		c.dbusClient.Object("org.freedesktop.NetworkManager", objPath)
 		setObject(c, "org.freedesktop.NetworkManager", objPath)
 		settings := make(map[string]interface{})
-		c.dbusClient.BusObj.Call("org.freedesktop.NetworkManager.Settings.Connection.GetSettings", 0).Store(&settings)
-		_, ok := settings["802-11-wireless"]
-		if ok {
-			objPath := dbus.ObjectPath(conn)
-			c.dbusClient.Object("org.freedesktop.NetworkManager", objPath)
-			setObject(c, "org.freedesktop.NetworkManager", objPath)
-			c.dbusClient.BusObj.Call("org.freedesktop.NetworkManager.Settings.Connection.Delete", 0)
+		c.dbusClient.BusObj.Call("org.freedesktop."+
+			"NetworkManager.Settings.Connection.GetSettings", 0).
+			Store(&settings)
+		wifiSett, ok := settings["802-11-wireless"].(map[string]interface{})
+		if !ok {
+			continue
+		}
+		isAp := false
+		mode, ok := wifiSett["mode"].(string)
+		if ok && mode == "ap" {
+			isAp = true
+		}
+		switch wifiType {
+		case StaWifiConn:
+			if isAp == true {
+				continue
+			}
+		case ApWifiConn:
+			if isAp == false {
+				continue
+			}
+		}
+		err = c.DeleteWifiConnection(conn)
+		if err != nil {
+			log.Printf("Error while deleting %s: %v", conn, err)
 		}
 	}
 }
 
-// DisconnectWifi disconnects every interface passed. return shows number of disconnect calls  made. Also deletes all 802-11-wireless connections as netman cruft we don't need.
-func (c *Client) DisconnectWifi(wifiDevices []string) int {
-	c.DeleteWifiConnections()
-	ran := 0
-	for _, d := range wifiDevices {
-		objPath := dbus.ObjectPath(d)
-		c.dbusClient.Object("org.freedesktop.NetworkManager", objPath)
-		setObject(c, "org.freedesktop.NetworkManager", objPath)
-		c.dbusClient.BusObj.Call("org.freedesktop.NetworkManager.Device.Disconnect", 0)
-		ran++
+// DisconnectDevice disconnects a device
+func (c *Client) DisconnectDevice(device string) error {
+	objPath := dbus.ObjectPath(device)
+	setObject(c, "org.freedesktop.NetworkManager", objPath)
+	err := c.dbusClient.BusObj.Call(
+		"org.freedesktop.NetworkManager.Device.Disconnect", 0).Err
+	if err != nil {
+		if err.Error() == "This device is not active" {
+			return nil
+		}
+		return err
 	}
-	return ran
+
+	return c.waitDeviceDisconnect(device)
 }
 
-// SetIfaceManaged sets passed device to be managed/unmanaged by network manager, return iface set, if any
+func (c *Client) waitDeviceDisconnect(device string) error {
+	rule := "type='signal',sender='org.freedesktop.NetworkManager'," +
+		"path='" + device + "'," +
+		"interface='org.freedesktop.NetworkManager.Device'," +
+		"member='StateChanged'"
+	setObject(c, "org.freedesktop.DBus", "/org/freedesktop/DBus")
+	err := c.dbusClient.BusObj.Call("org.freedesktop.DBus.AddMatch", 0, rule).Err
+	if err != nil {
+		return err
+	}
+	defer func() {
+		setObject(c, "org.freedesktop.DBus", "/org/freedesktop/DBus")
+		err := c.dbusClient.BusObj.Call(
+			"org.freedesktop.DBus.RemoveMatch", 0, rule).Err
+		if err != nil {
+			log.Printf("Error when calling RemoveMatch: %v", err)
+		}
+	}()
+
+	chSig := make(chan *dbus.Signal, 10)
+	defer close(chSig)
+	c.dbusClient.Connection.Signal(chSig)
+	defer c.dbusClient.Connection.RemoveSignal(chSig)
+
+	// Get current state, as we might have missed the signal while we were
+	// registering for it (the connection already existed).
+	devPath := dbus.ObjectPath(device)
+	setObject(c, "org.freedesktop.NetworkManager", devPath)
+	state, err := c.dbusClient.BusObj.GetProperty(
+		"org.freedesktop.NetworkManager.Device.State")
+	if err != nil {
+		return err
+	}
+	// NM_DEVICE_STATE_DISCONNECTED = 30
+	if state.Value() == 30 {
+		return nil
+	}
+
+SignalLoop:
+	for {
+		select {
+		case sig := <-chSig:
+			// Note that we need to make sure the signal comes from
+			// the right object, as we will receive here any signal
+			// to which the process has registered.
+			// NM_DEVICE_STATE_DISCONNECTED = 30
+			if sig.Path == devPath &&
+				sig.Name ==
+					"org.freedesktop.NetworkManager.Device.StateChanged" &&
+				sig.Body[0].(uint32) == 30 {
+				break SignalLoop
+			}
+		case <-time.After(20 * time.Second):
+			return fmt.Errorf("Timeout while waiting for disconnection")
+		}
+	}
+
+	return nil
+}
+
+// SetIfaceManaged sets passed device to be managed/unmanaged by network
+// manager, return iface set, if any
 func (c *Client) SetIfaceManaged(iface string, state bool, devices []string) string {
 	for _, d := range devices {
 		objPath := dbus.ObjectPath(d)
-		c.dbusClient.Object("org.freedesktop.NetworkManager", objPath)
 		setObject(c, "org.freedesktop.NetworkManager", objPath)
-		intface, err2 := c.dbusClient.BusObj.GetProperty("org.freedesktop.NetworkManager.Device.Interface")
+		intface, err2 := c.dbusClient.BusObj.GetProperty(
+			"org.freedesktop.NetworkManager.Device.Interface")
 		if err2 != nil {
 			log.Printf("Error in SetIfaceManaged() geting interface: %v", err2)
 			return ""
@@ -357,9 +497,11 @@ func (c *Client) SetIfaceManaged(iface string, state bool, devices []string) str
 		if iface != intface.Value().(string) {
 			continue
 		}
-		managed, err := c.dbusClient.BusObj.GetProperty("org.freedesktop.NetworkManager.Device.Managed")
+		managed, err := c.dbusClient.BusObj.GetProperty(
+			"org.freedesktop.NetworkManager.Device.Managed")
 		if err != nil {
-			log.Printf("Error in SetIfaceManaged() fetching device managed: %v", err)
+			log.Printf("Error in SetIfaceManaged() fetching device managed: %v",
+				err)
 			return ""
 		}
 		switch state {
@@ -373,21 +515,26 @@ func (c *Client) SetIfaceManaged(iface string, state bool, devices []string) str
 			}
 		}
 
-		c.dbusClient.BusObj.Call("org.freedesktop.DBus.Properties.Set", 0, "org.freedesktop.NetworkManager.Device", "Managed", dbus.MakeVariant(state))
+		c.dbusClient.BusObj.Call("org.freedesktop.DBus.Properties.Set",
+			0, "org.freedesktop.NetworkManager.Device",
+			"Managed", dbus.MakeVariant(state))
 		// loop until interface is in desired managed state or max iters reached
 		idx := -1
 		for {
 			idx++
 			time.Sleep(1000 * time.Millisecond)
-			managedState, err := c.dbusClient.BusObj.GetProperty("org.freedesktop.NetworkManager.Device.State")
+			managedState, err := c.dbusClient.BusObj.GetProperty(
+				"org.freedesktop.NetworkManager.Device.State")
 			if err == nil {
 				switch state {
 				case true:
-					if managedState.Value() == uint32(30) { //NM_DEVICE_STATE_DISCONNECTED
+					if managedState.Value() == uint32(30) {
+						//NM_DEVICE_STATE_DISCONNECTED
 						return iface
 					}
 				case false:
-					if managedState.Value() == uint32(10) { //NM_DEVICE_STATE_UNMANAGED
+					if managedState.Value() == uint32(10) {
+						//NM_DEVICE_STATE_UNMANAGED
 						return iface
 					}
 				}
@@ -400,21 +547,25 @@ func (c *Client) SetIfaceManaged(iface string, state bool, devices []string) str
 	return "" //no iface state changed
 }
 
-// WifisManaged returns  map[iface]device of wifi iterfaces that are managed by network manager
+// WifisManaged returns map[iface]device of wifi interfaces that are
+// managed by network manager
 func (c *Client) WifisManaged(wifiDevices []string) (map[string]string, error) {
 	ifaces := make(map[string]string)
 	for _, d := range wifiDevices {
 		objPath := dbus.ObjectPath(d)
-		c.dbusClient.Object("org.freedesktop.NetworkManager", objPath)
 		setObject(c, "org.freedesktop.NetworkManager", objPath)
-		managed, err := c.dbusClient.BusObj.GetProperty("org.freedesktop.NetworkManager.Device.Managed")
+		managed, err := c.dbusClient.BusObj.GetProperty(
+			"org.freedesktop.NetworkManager.Device.Managed")
 		if err != nil {
-			log.Printf("Error in WifisManaged() getting device managed: %v", err)
+			log.Printf("Error in WifisManaged() getting device managed: %v",
+				err)
 			return ifaces, err
 		}
-		iface, err2 := c.dbusClient.BusObj.GetProperty("org.freedesktop.NetworkManager.Device.Interface")
+		iface, err2 := c.dbusClient.BusObj.GetProperty(
+			"org.freedesktop.NetworkManager.Device.Interface")
 		if err2 != nil {
-			log.Printf("Error in WifisManaged() getting device interface: %v", err)
+			log.Printf("Error in WifisManaged() getting device interface: %v",
+				err)
 			return ifaces, err2
 		}
 		if managed.Value().(bool) == true {
@@ -424,75 +575,208 @@ func (c *Client) WifisManaged(wifiDevices []string) (map[string]string, error) {
 	return ifaces, nil
 }
 
-// Unmanage sets wlan0 to be Unmanaged by network manager if it
+// Unmanage sets an interface to be Unmanaged by network manager if it
 // is managed
-func (c *Client) Unmanage() error {
-	ifaces, err := c.WifisManaged(c.GetWifiDevices(c.GetDevices()))
+func (c *Client) Unmanage(wifiIface string) error {
+	ifaces, err := c.WifisManaged(c.GetWifiDevices())
 	if err != nil {
 		return fmt.Errorf("Error getting managed wifis: %v", err)
 	}
-	if _, ok := ifaces["wlan0"]; ok {
-		if c.SetIfaceManaged("wlan0", false, c.GetWifiDevices(c.GetDevices())) == "" {
+	if _, ok := ifaces[wifiIface]; ok {
+		if c.SetIfaceManaged(wifiIface, false,
+			c.GetWifiDevices()) == "" {
 			return fmt.Errorf("No interface was set to unmanaged")
 		}
 	}
 	return nil
 }
 
-// Manage sets wlan0 to not managed by network manager
-func (c *Client) Manage() error {
-	if c.SetIfaceManaged("wlan0", true, c.GetWifiDevices(c.GetDevices())) == "" {
+// Manage sets an interface to not managed by network manager
+func (c *Client) Manage(wifiIface string) error {
+	if c.SetIfaceManaged(wifiIface, true,
+		c.GetWifiDevices()) == "" {
 		return fmt.Errorf("No interface was set to managed")
 	}
 	return nil
 }
 
-// ScanAndWriteSsidsToFile scans for ssids and writes to file
-func (c *Client) ScanAndWriteSsidsToFile(filepath string) bool {
+// CreateAccessPoint creates an AP with given SSID and password, for the wifi
+// interface specified. Returns the path to the connection settings and the
+// active connection.
+func (c *Client) CreateAccessPoint(ssid string, password string,
+	iface string, ipAddress string, prefix uint) (string, string, error) {
 
-	var err error
-	var file *os.File
-	if _, err = os.Stat(filepath); os.IsNotExist(err) {
-		file, err = os.Create(filepath)
-		if err != nil {
-			log.Printf("Error touching ssids file: %v", err)
-			return false
-		}
+	wifiPath, err := c.GetDevicePathFromIface(iface)
+	if err != nil {
+		return "", "", err
 	}
 
-	file, err = os.OpenFile(filepath, os.O_RDWR, 0644)
+	setObject(c, "org.freedesktop.NetworkManager",
+		"/org/freedesktop/NetworkManager")
+
+	connectSett := make(map[string]dbus.Variant)
+	connectSett["id"] = dbus.MakeVariant(ssid)
+	connectSett["autoconnect"] = dbus.MakeVariant(false)
+
+	wirelessSett := make(map[string]dbus.Variant)
+	wirelessSett["ssid"] = dbus.MakeVariant([]byte(ssid))
+	wirelessSett["mode"] = dbus.MakeVariant("ap")
+
+	securitySett := make(map[string]dbus.Variant)
+	securitySett["key-mgmt"] = dbus.MakeVariant("wpa-psk")
+	securitySett["psk"] = dbus.MakeVariant(password)
+	securitySett["proto"] = dbus.MakeVariant([]string{"rsn"})
+	securitySett["pairwise"] = dbus.MakeVariant([]string{"ccmp"})
+	securitySett["group"] = dbus.MakeVariant([]string{"ccmp"})
+
+	ipv4Sett := make(map[string]dbus.Variant)
+	ipv4Sett["method"] = dbus.MakeVariant("manual")
+	ipv4Address := make(map[string]dbus.Variant)
+	ipv4Address["address"] = dbus.MakeVariant(ipAddress)
+	ipv4Address["prefix"] = dbus.MakeVariant(uint32(prefix))
+	ipv4AddressData := make([]map[string]dbus.Variant, 1)
+	ipv4AddressData[0] = ipv4Address
+	ipv4Sett["address-data"] = dbus.MakeVariant(ipv4AddressData)
+
+	ipv6Sett := make(map[string]dbus.Variant)
+	ipv6Sett["method"] = dbus.MakeVariant("ignore")
+
+	settings := make(map[string]map[string]dbus.Variant)
+	settings["connection"] = connectSett
+	settings["802-11-wireless"] = wirelessSett
+	settings["802-11-wireless-security"] = securitySett
+	settings["ipv4"] = ipv4Sett
+	settings["ipv6"] = ipv6Sett
+
+	var connPath, actConnPath string
+	err = c.dbusClient.BusObj.Call(
+		"org.freedesktop.NetworkManager.AddAndActivateConnection", 0,
+		settings, dbus.ObjectPath(wifiPath), dbus.ObjectPath("/")).
+		Store(&connPath, &actConnPath)
 	if err != nil {
-		log.Printf("Error opening ssids file: %v", err)
-		return false
+		return "", "", err
 	}
 
-	defer file.Close()
+	log.Printf("Connection setting in %s", connPath)
+	log.Printf("Active connection config in %s", actConnPath)
+	return connPath, actConnPath, c.WaitConnectionActivated(actConnPath)
+}
+
+// ActivateConnection starts a connection on a device
+func (c *Client) ActivateConnection(devicePath string,
+	connPath string) (string, error) {
 
-	return c.scanSsids(file)
+	setObject(c, "org.freedesktop.NetworkManager",
+		"/org/freedesktop/NetworkManager")
 
+	var activeConnPath string
+	err := c.dbusClient.BusObj.Call(
+		"org.freedesktop.NetworkManager.ActivateConnection", 0,
+		dbus.ObjectPath(connPath), dbus.ObjectPath(devicePath),
+		dbus.ObjectPath("/")).Store(&activeConnPath)
+	if err != nil {
+		return "", err
+	}
+	return activeConnPath, c.WaitConnectionActivated(activeConnPath)
 }
 
-// ScanSsids sets wlan0 to be managed and then scans
-// for ssids. If found, write the ssids (comma separated)
-// to writer and return true, else return false.
-func (c *Client) scanSsids(writer io.Writer) bool {
-	c.Manage()
-	SSIDs, _, _ := c.Ssids()
-	//only write SSIDs when found
-	if len(SSIDs) > 0 {
-		var out string
-		for _, ssid := range SSIDs {
-			out += strings.TrimSpace(ssid.Ssid) + ","
-		}
-		out = out[:len(out)-1]
-		_, err := writer.Write([]byte(out))
+// WaitConnectionActivated waits until a connection has been activated
+func (c *Client) WaitConnectionActivated(actConnPath string) error {
+	rule := "type='signal',sender='org.freedesktop.NetworkManager'," +
+		"path='" + actConnPath + "'," +
+		"interface='org.freedesktop.NetworkManager.Connection.Active'," +
+		"member='StateChanged'"
+	setObject(c, "org.freedesktop.DBus", "/org/freedesktop/DBus")
+	err := c.dbusClient.BusObj.Call("org.freedesktop.DBus.AddMatch", 0, rule).Err
+	if err != nil {
+		return err
+	}
+	defer func() {
+		setObject(c, "org.freedesktop.DBus", "/org/freedesktop/DBus")
+		err := c.dbusClient.BusObj.Call("org.freedesktop.DBus.RemoveMatch", 0, rule).Err
 		if err != nil {
-			log.Printf("Error writing SSID(s): %v ", err)
-		} else {
-			log.Print("SSID(s) obtained")
-			return true
+			log.Printf("Error when calling RemoveMatch: %v", err)
 		}
+	}()
+
+	chSig := make(chan *dbus.Signal, 10)
+	defer close(chSig)
+	c.dbusClient.Connection.Signal(chSig)
+	defer c.dbusClient.Connection.RemoveSignal(chSig)
+
+	// Get current state, as we might have missed the signal while we were
+	// registering for it (the connection already existed).
+	setObject(c, "org.freedesktop.NetworkManager", dbus.ObjectPath(actConnPath))
+	state, err := c.dbusClient.BusObj.GetProperty(
+		"org.freedesktop.NetworkManager.Connection.Active.State")
+	if err != nil {
+		return err
 	}
-	log.Print("No SSID found")
-	return false
+	// NM_ACTIVE_CONNECTION_STATE_ACTIVATED = 2
+	if state.Value() == 2 {
+		return nil
+	}
+
+SignalLoop:
+	for {
+		select {
+		case sig := <-chSig:
+			// Note that we need to make sure the signal comes from
+			// the right object, as we will receive here any signal
+			// to which the process has registered.
+			// NM_ACTIVE_CONNECTION_STATE_ACTIVATED = 2
+			if sig.Path == dbus.ObjectPath(actConnPath) &&
+				sig.Body[0].(uint32) == 2 {
+				break SignalLoop
+			}
+		case <-time.After(20 * time.Second):
+			return fmt.Errorf("Timeout while waiting for conn activation")
+		}
+	}
+
+	return nil
+}
+
+// CheckNetworkManagerRunning finds out whether NM is running or not
+func (c *Client) CheckNetworkManagerRunning() (bool, error) {
+	setObject(c, "org.freedesktop.DBus", "/org/freedesktop/DBus")
+	err := c.dbusClient.BusObj.Call(
+		"org.freedesktop.DBus.GetNameOwner", 0,
+		"org.freedesktop.NetworkManager").Err
+	if err != nil {
+		return false, err
+	}
+	return true, nil
+}
+
+// RegisterForNameOwnerChanged registers for changes in DBus names
+func (c *Client) RegisterForNameOwnerChanged(chSig chan<- *dbus.Signal) error {
+	rule := "type='signal',sender='org.freedesktop.DBus'," +
+		"path='/org/freedesktop/DBus'," +
+		"interface='org.freedesktop.DBus'," +
+		"member='NameOwnerChanged'"
+	setObject(c, "org.freedesktop.DBus", "/org/freedesktop/DBus")
+	err := c.dbusClient.BusObj.Call("org.freedesktop.DBus.AddMatch", 0, rule).Err
+	if err != nil {
+		return err
+	}
+
+	c.dbusClient.Connection.Signal(chSig)
+	return nil
+}
+
+// UnregisterForNameOwnerChanged unregisters for changes in DBus names
+func (c *Client) UnregisterForNameOwnerChanged(chSig chan<- *dbus.Signal) error {
+	rule := "type='signal',sender='org.freedesktop.DBus'," +
+		"path='/org/freedesktop/DBus'," +
+		"interface='org.freedesktop.DBus'," +
+		"member='NameOwnerChanged'"
+	setObject(c, "org.freedesktop.DBus", "/org/freedesktop/DBus")
+	err := c.dbusClient.BusObj.Call("org.freedesktop.DBus.RemoveMatch", 0, rule).Err
+	if err != nil {
+		log.Printf("Error unregistering for NameOwnerChanged: %v", err)
+	}
+
+	c.dbusClient.Connection.RemoveSignal(chSig)
+	return err
 }
diff --git a/netman/dbus_test.go b/netman/dbus_test.go
index c27a2f6..3110d1e 100644
--- a/netman/dbus_test.go
+++ b/netman/dbus_test.go
@@ -18,6 +18,7 @@
 package netman
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"strconv"
@@ -77,16 +78,23 @@ func (mock *mockObj) Call(method string, flags dbus.Flags, args ...interface{}) 
 	return call
 }
 
-func (mock *mockObj) Go(method string, flags dbus.Flags, ch chan *dbus.Call, args ...interface{}) *dbus.Call {
+func (mock *mockObj) Go(method string, flags dbus.Flags, ch chan *dbus.Call,
+	args ...interface{}) *dbus.Call {
 	call := makeCall()
 	return call
 }
 
+func (mock *mockObj) GoWithContext(ctx context.Context, method string,
+	flags dbus.Flags, ch chan *dbus.Call, args ...interface{}) *dbus.Call {
+	return nil
+}
+
 func (mock *mockObj) GetProperty(p string) (dbus.Variant, error) {
 	switch p {
 	case "org.freedesktop.NetworkManager.Device.DeviceType":
 		if len(mock.wifiDevices) < 2 { // 2 of three devices are wifi
-			mock.wifiDevices = append(mock.wifiDevices, "wifi"+strconv.Itoa(len(mock.wifiDevices)))
+			mock.wifiDevices = append(mock.wifiDevices,
+				"wifi"+strconv.Itoa(len(mock.wifiDevices)))
 			return dbus.MakeVariant(uint32(2)), nil
 		}
 		return dbus.MakeVariant(uint32(1)), nil
@@ -123,6 +131,25 @@ func (mock *mockObj) GetProperty(p string) (dbus.Variant, error) {
 	return dbus.MakeVariant("GetProperty error"), errors.New("no such property found")
 }
 
+func (mock *mockObj) AddMatchSignal(iface, member string,
+	options ...dbus.MatchOption) *dbus.Call {
+	return nil
+}
+
+func (mock *mockObj) RemoveMatchSignal(iface, member string,
+	options ...dbus.MatchOption) *dbus.Call {
+	return nil
+}
+
+func (mock *mockObj) CallWithContext(ctx context.Context, method string,
+	flags dbus.Flags, args ...interface{}) *dbus.Call {
+	return nil
+}
+
+func (mock *mockObj) SetProperty(p string, v interface{}) error {
+	return nil
+}
+
 func (mock *mockObj) Destination() string {
 	return "destination"
 }
@@ -160,11 +187,10 @@ func TestGetDevices(t *testing.T) {
 
 func TestGetWifiDevices(t *testing.T) {
 	client := NewClient(&mockObj{})
-	devices := client.GetDevices()
-	wifiDevices := client.GetWifiDevices(devices)
+	wifiDevices := client.GetWifiDevices()
 	found1 := false
 	found2 := false
-	for _, v := range devices {
+	for _, v := range wifiDevices {
 		switch v {
 		case "/d/1":
 			found1 = true
@@ -176,16 +202,16 @@ func TestGetWifiDevices(t *testing.T) {
 		t.Errorf("An expected device was not found")
 	}
 	if len(wifiDevices) != 2 {
-		t.Errorf("Two wifi device should have been found but, found: %d", len(wifiDevices))
+		t.Errorf("Two wifi device should have been found but, found: %d",
+			len(wifiDevices))
 	}
 	fmt.Printf("===== Found wifi devices: %v\n", wifiDevices)
 }
 
 func TestGetAPs(t *testing.T) {
 	client := NewClient(&mockObj{})
-	devices := client.GetDevices()
 	ap2device := make(map[string]string)
-	wifiDevices := client.GetWifiDevices(devices)
+	wifiDevices := client.GetWifiDevices()
 	aps := client.GetAccessPoints(wifiDevices, ap2device)
 	if len(aps) != 4 {
 		t.Errorf("4 APs  should have been found, but found: %d", len(aps))
@@ -195,8 +221,7 @@ func TestGetAPs(t *testing.T) {
 
 func TestGetSsids(t *testing.T) {
 	client := NewClient(&mockObj{})
-	devices := client.GetDevices()
-	wifiDevices := client.GetWifiDevices(devices)
+	wifiDevices := client.GetWifiDevices()
 	ap2device := make(map[string]string)
 	ssid2ap := make(map[string]string)
 	aps := client.GetAccessPoints(wifiDevices, ap2device)
@@ -209,8 +234,8 @@ func TestGetSsids(t *testing.T) {
 
 func TestSsids(t *testing.T) {
 	client := NewClient(&mockObj{})
-	ssids, _, _ := client.Ssids()
-	if len(ssids) != 4 {
+	ssids, _, _ := client.Ssids("/d/3")
+	if len(ssids) != 2 {
 		t.Errorf("4 SSIDs should have been found, but found: %d", len(ssids))
 	}
 	fmt.Printf("===== Ssids() (ssid/ap): %v\n", ssids)
@@ -232,26 +257,14 @@ func TestConnectedWifi(t *testing.T) {
 	mock := &mockObj{}
 	mock.connect = true
 	client := NewClient(mock)
-	if !client.ConnectedWifi([]string{"d1"}) {
+	if !client.Connected([]string{"d1"}) {
 		t.Errorf("Should have found Wificonnected state, but did not")
 	}
-	if client.ConnectedWifi([]string{}) {
+	if client.Connected([]string{}) {
 		t.Errorf("Should have found no connection since there are no devices, but did not")
 	}
 }
 
-func TestDiscconnectWifi(t *testing.T) {
-	client := NewClient(&mockObj{})
-	res := client.DisconnectWifi([]string{})
-	if res != 0 {
-		t.Errorf("0 Disconnect call expected, but found: %d", res)
-	}
-	res = client.DisconnectWifi([]string{"d1"})
-	if res != 1 {
-		t.Errorf("1 Disconnect call expected, but found: %d", res)
-	}
-}
-
 func TestSetIfaceManaged(t *testing.T) {
 	mock := &mockObj{}
 	client := NewClient(mock)
diff --git a/run-checks b/run-checks
index 562c14d..d922caf 100755
--- a/run-checks
+++ b/run-checks
@@ -85,7 +85,7 @@ if [ ! -z "$STATIC" ]; then
 
     # golint
     echo Install golint
-    go get github.com/golang/lint/golint
+    go get -u golang.org/x/lint/golint
     export PATH=$PATH:$GOPATH/bin
 
     echo Running lint
diff --git a/scriptlets/country-codes b/scriptlets/country-codes
index d4e8a97..16c718a 100644
--- a/scriptlets/country-codes
+++ b/scriptlets/country-codes
@@ -1,243 +1,250 @@
-<html><head><title>ISO-3166-1 Country Names</title></head>
-<body bgcolor=#ffffff>
-<h2>ISO-3166-1 Country Names</h2>
-<a href="/iso3166/">Reproduced with permission from ISO</a>
-<p>
-Follow links for ISO-3166-2 subdivision codes
-<p>
-<a href=iso.AD.html>AD</a> : ANDORRA<br>
-<a href=iso.AE.html>AE</a> : UNITED ARAB EMIRATES<br>
-<a href=iso.AF.html>AF</a> : AFGHANISTAN<br>
-<a href=iso.AG.html>AG</a> : ANTIGUA AND BARBUDA<br>
-<a href=iso.AI.html>AI</a> : ANGUILLA<br>
-<a href=iso.AL.html>AL</a> : ALBANIA<br>
-<a href=iso.AM.html>AM</a> : ARMENIA<br>
-<a href=iso.AN.html>AN</a> : NETHERLANDS ANTILLES<br>
-<a href=iso.AO.html>AO</a> : ANGOLA<br>
-<a href=iso.AQ.html>AQ</a> : ANTARCTICA<br>
-<a href=iso.AR.html>AR</a> : ARGENTINA<br>
-<a href=iso.AS.html>AS</a> : AMERICAN SAMOA<br>
-<a href=iso.AT.html>AT</a> : AUSTRIA<br>
-<a href=iso.AU.html>AU</a> : AUSTRALIA<br>
-<a href=iso.AW.html>AW</a> : ARUBA<br>
-<a href=iso.AZ.html>AZ</a> : AZERBAIJAN<br>
-<a href=iso.BA.html>BA</a> : BOSNIA AND HERZEGOVINA<br>
-<a href=iso.BB.html>BB</a> : BARBADOS<br>
-<a href=iso.BD.html>BD</a> : BANGLADESH<br>
-<a href=iso.BE.html>BE</a> : BELGIUM<br>
-<a href=iso.BF.html>BF</a> : BURKINA FASO<br>
-<a href=iso.BG.html>BG</a> : BULGARIA<br>
-<a href=iso.BH.html>BH</a> : BAHRAIN<br>
-<a href=iso.BI.html>BI</a> : BURUNDI<br>
-<a href=iso.BJ.html>BJ</a> : BENIN<br>
-<a href=iso.BM.html>BM</a> : BERMUDA<br>
-<a href=iso.BN.html>BN</a> : BRUNEI DARUSSALAM<br>
-<a href=iso.BO.html>BO</a> : BOLIVIA<br>
-<a href=iso.BR.html>BR</a> : BRAZIL<br>
-<a href=iso.BS.html>BS</a> : BAHAMAS<br>
-<a href=iso.BT.html>BT</a> : BHUTAN<br>
-<a href=iso.BV.html>BV</a> : BOUVET ISLAND<br>
-<a href=iso.BW.html>BW</a> : BOTSWANA<br>
-<a href=iso.BY.html>BY</a> : BELARUS<br>
-<a href=iso.BZ.html>BZ</a> : BELIZE<br>
-<a href=iso.CA.html>CA</a> : CANADA<br>
-<a href=iso.CC.html>CC</a> : COCOS (KEELING) ISLANDS<br>
-<a href=iso.CD.html>CD</a> : CONGO, THE DEMOCRATIC REPUBLIC OF THE<br>
-<a href=iso.CF.html>CF</a> : CENTRAL AFRICAN REPUBLIC<br>
-<a href=iso.CG.html>CG</a> : CONGO<br>
-<a href=iso.CH.html>CH</a> : SWITZERLAND<br>
-<a href=iso.CI.html>CI</a> : C�TE D'IVOIRE<br>
-<a href=iso.CK.html>CK</a> : COOK ISLANDS<br>
-<a href=iso.CL.html>CL</a> : CHILE<br>
-<a href=iso.CM.html>CM</a> : CAMEROON<br>
-<a href=iso.CN.html>CN</a> : CHINA<br>
-<a href=iso.CO.html>CO</a> : COLOMBIA<br>
-<a href=iso.CR.html>CR</a> : COSTA RICA<br>
-<a href=iso.CU.html>CU</a> : CUBA<br>
-<a href=iso.CV.html>CV</a> : CAPE VERDE<br>
-<a href=iso.CX.html>CX</a> : CHRISTMAS ISLAND<br>
-<a href=iso.CY.html>CY</a> : CYPRUS<br>
-<a href=iso.CZ.html>CZ</a> : CZECH REPUBLIC<br>
-<a href=iso.DE.html>DE</a> : GERMANY<br>
-<a href=iso.DJ.html>DJ</a> : DJIBOUTI<br>
-<a href=iso.DK.html>DK</a> : DENMARK<br>
-<a href=iso.DM.html>DM</a> : DOMINICA<br>
-<a href=iso.DO.html>DO</a> : DOMINICAN REPUBLIC<br>
-<a href=iso.DZ.html>DZ</a> : ALGERIA<br>
-<a href=iso.EC.html>EC</a> : ECUADOR<br>
-<a href=iso.EE.html>EE</a> : ESTONIA<br>
-<a href=iso.EG.html>EG</a> : EGYPT<br>
-<a href=iso.EH.html>EH</a> : WESTERN SARARA<br>
-<a href=iso.ER.html>ER</a> : ERITREA<br>
-<a href=iso.ES.html>ES</a> : SPAIN<br>
-<a href=iso.ET.html>ET</a> : ETHIOPIA<br>
-<a href=iso.FI.html>FI</a> : FINLAND<br>
-<a href=iso.FJ.html>FJ</a> : FIJI<br>
-<a href=iso.FK.html>FK</a> : FALKLAND ISLANDS (MALVINAS)<br>
-<a href=iso.FM.html>FM</a> : MICRONESIA, FEDERATED STATES OF<br>
-<a href=iso.FO.html>FO</a> : FAROE ISLANDS<br>
-<a href=iso.FR.html>FR</a> : FRANCE<br>
-<a href=iso.GA.html>GA</a> : GABON<br>
-<a href=iso.GB.html>GB</a> : UNITED KINGDOM<br>
-<a href=iso.GD.html>GD</a> : GRENADA<br>
-<a href=iso.GE.html>GE</a> : GEORGIA<br>
-<a href=iso.GF.html>GF</a> : FRENCH GUIANA<br>
-<a href=iso.GH.html>GH</a> : GHANA<br>
-<a href=iso.GI.html>GI</a> : GIBRALTAR<br>
-<a href=iso.GL.html>GL</a> : GREENLAND<br>
-<a href=iso.GM.html>GM</a> : GAMBIA<br>
-<a href=iso.GN.html>GN</a> : GUINEA<br>
-<a href=iso.GP.html>GP</a> : GUADELOUPE<br>
-<a href=iso.GQ.html>GQ</a> : EQUATORIAL GUINEA<br>
-<a href=iso.GR.html>GR</a> : GREECE<br>
-<a href=iso.GS.html>GS</a> : SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS<br>
-<a href=iso.GT.html>GT</a> : GUATEMALA<br>
-<a href=iso.GU.html>GU</a> : GUAM<br>
-<a href=iso.GW.html>GW</a> : GUINEA-BISSAU<br>
-<a href=iso.GY.html>GY</a> : GUYANA<br>
-<a href=iso.HK.html>HK</a> : HONG KONG<br>
-<a href=iso.HM.html>HM</a> : HEARD ISLAND AND MCDONALD ISLANDS<br>
-<a href=iso.HN.html>HN</a> : HONDURAS<br>
-<a href=iso.HR.html>HR</a> : CROATIA<br>
-<a href=iso.HT.html>HT</a> : HAITI<br>
-<a href=iso.HU.html>HU</a> : HUNGARY<br>
-<a href=iso.ID.html>ID</a> : INDONESIA<br>
-<a href=iso.IE.html>IE</a> : IRELAND<br>
-<a href=iso.IL.html>IL</a> : ISRAEL<br>
-<a href=iso.IN.html>IN</a> : INDIA<br>
-<a href=iso.IO.html>IO</a> : BRITISH INDIAN OCEAN TERRITORY<br>
-<a href=iso.IQ.html>IQ</a> : IRAQ<br>
-<a href=iso.IR.html>IR</a> : IRAN, ISLAMIC REPUBLIC OF<br>
-<a href=iso.IS.html>IS</a> : ICELAND<br>
-<a href=iso.IT.html>IT</a> : ITALY<br>
-<a href=iso.JM.html>JM</a> : JAMAICA<br>
-<a href=iso.JO.html>JO</a> : JORDAN<br>
-<a href=iso.JP.html>JP</a> : JAPAN<br>
-<a href=iso.KE.html>KE</a> : KENYA<br>
-<a href=iso.KG.html>KG</a> : KYRGYZSTAN<br>
-<a href=iso.KH.html>KH</a> : CAMBODIA<br>
-<a href=iso.KI.html>KI</a> : KIRIBATI<br>
-<a href=iso.KM.html>KM</a> : COMOROS<br>
-<a href=iso.KN.html>KN</a> : SAINT KITTS AND NEVIS<br>
-<a href=iso.KP.html>KP</a> : KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF<br>
-<a href=iso.KR.html>KR</a> : KOREA, REPUBLIC OF<br>
-<a href=iso.KW.html>KW</a> : KUWAIT<br>
-<a href=iso.KY.html>KY</a> : CAYMAN ISLANDS<br>
-<a href=iso.KZ.html>KZ</a> : KAZAKHSTAN<br>
-<a href=iso.LA.html>LA</a> : LAO PEOPLE'S DEMOCRATIC REPUBLIC<br>
-<a href=iso.LB.html>LB</a> : LEBANON<br>
-<a href=iso.LC.html>LC</a> : SAINT LUCIA<br>
-<a href=iso.LI.html>LI</a> : LIECHTENSTEIN<br>
-<a href=iso.LK.html>LK</a> : SRI LANKA<br>
-<a href=iso.LR.html>LR</a> : LIBERIA<br>
-<a href=iso.LS.html>LS</a> : LESOTHO<br>
-<a href=iso.LT.html>LT</a> : LITHUANIA<br>
-<a href=iso.LU.html>LU</a> : LUXEMBOURG<br>
-<a href=iso.LV.html>LV</a> : LATVIA<br>
-<a href=iso.LY.html>LY</a> : LIBYAN ARAB JAMABIRIYA<br>
-<a href=iso.MA.html>MA</a> : MOROCCO<br>
-<a href=iso.MC.html>MC</a> : MONACO<br>
-<a href=iso.MD.html>MD</a> : MOLDOVA, REPUBLIC OF<br>
-<a href=iso.MG.html>MG</a> : MADAGASCAR<br>
-<a href=iso.MH.html>MH</a> : MARSHALL ISLANDS<br>
-<a href=iso.MK.html>MK</a> : MACEDONIA, THE FORMER YUGOSLAV REPU8LIC OF<br>
-<a href=iso.ML.html>ML</a> : MALI<br>
-<a href=iso.MM.html>MM</a> : MYANMAR<br>
-<a href=iso.MN.html>MN</a> : MONGOLIA<br>
-<a href=iso.MO.html>MO</a> : MACAU<br>
-<a href=iso.MP.html>MP</a> : NORTHERN MARIANA ISLANDS<br>
-<a href=iso.MQ.html>MQ</a> : MARTINIQUE<br>
-<a href=iso.MR.html>MR</a> : MAURITANIA<br>
-<a href=iso.MS.html>MS</a> : MONTSERRAT<br>
-<a href=iso.MT.html>MT</a> : MALTA<br>
-<a href=iso.MU.html>MU</a> : MAURITIUS<br>
-<a href=iso.MV.html>MV</a> : MALDIVES<br>
-<a href=iso.MW.html>MW</a> : MALAWI<br>
-<a href=iso.MX.html>MX</a> : MEXICO<br>
-<a href=iso.MY.html>MY</a> : MALAYSIA<br>
-<a href=iso.MZ.html>MZ</a> : MOZAMBIQUE<br>
-<a href=iso.NA.html>NA</a> : NAMIBIA<br>
-<a href=iso.NC.html>NC</a> : NEW CALEDONIA<br>
-<a href=iso.NE.html>NE</a> : NIGER<br>
-<a href=iso.NF.html>NF</a> : NORFOLK ISLAND<br>
-<a href=iso.NG.html>NG</a> : NIGERIA<br>
-<a href=iso.NI.html>NI</a> : NICARAGUA<br>
-<a href=iso.NL.html>NL</a> : NETHERLANDS<br>
-<a href=iso.NO.html>NO</a> : NORWAY<br>
-<a href=iso.NP.html>NP</a> : NEPAL<br>
-<a href=iso.NU.html>NU</a> : NIUE<br>
-<a href=iso.NZ.html>NZ</a> : NEW ZEALAND<br>
-<a href=iso.OM.html>OM</a> : OMAN<br>
-<a href=iso.PA.html>PA</a> : PANAMA<br>
-<a href=iso.PE.html>PE</a> : PERU<br>
-<a href=iso.PF.html>PF</a> : FRENCH POLYNESIA<br>
-<a href=iso.PG.html>PG</a> : PAPUA NEW GUINEA<br>
-<a href=iso.PH.html>PH</a> : PHILIPPINES<br>
-<a href=iso.PK.html>PK</a> : PAKISTAN<br>
-<a href=iso.PL.html>PL</a> : POLAND<br>
-<a href=iso.PM.html>PM</a> : SAINT PIERRE AND MIQUELON<br>
-<a href=iso.PN.html>PN</a> : PITCAIRN<br>
-<a href=iso.PR.html>PR</a> : PUERTO RICO<br>
-<a href=iso.PT.html>PT</a> : PORTUGAL<br>
-<a href=iso.PW.html>PW</a> : PALAU<br>
-<a href=iso.PY.html>PY</a> : PARAGUAY<br>
-<a href=iso.QA.html>QA</a> : QATAR<br>
-<a href=iso.RE.html>RE</a> : R�UNION<br>
-<a href=iso.RO.html>RO</a> : ROMANIA<br>
-<a href=iso.RU.html>RU</a> : RUSSIAN FEDERATION<br>
-<a href=iso.RW.html>RW</a> : RWANDA<br>
-<a href=iso.SA.html>SA</a> : SAUDI ARABIA<br>
-<a href=iso.SB.html>SB</a> : SOLOMON ISLANDS<br>
-<a href=iso.SC.html>SC</a> : SEYCHELLES<br>
-<a href=iso.SD.html>SD</a> : SUDAN<br>
-<a href=iso.SE.html>SE</a> : SWEDEN<br>
-<a href=iso.SG.html>SG</a> : SINGAPORE<br>
-<a href=iso.SH.html>SH</a> : SAINT HELENA<br>
-<a href=iso.SI.html>SI</a> : SLOVENIA<br>
-<a href=iso.SJ.html>SJ</a> : SVALBARD AND JAN MAYEN<br>
-<a href=iso.SK.html>SK</a> : SLOVAKIA<br>
-<a href=iso.SL.html>SL</a> : SIERRA LEONE<br>
-<a href=iso.SM.html>SM</a> : SAN MARINO<br>
-<a href=iso.SN.html>SN</a> : SENEGAL<br>
-<a href=iso.SO.html>SO</a> : SOMALIA<br>
-<a href=iso.SR.html>SR</a> : SURINAME<br>
-<a href=iso.ST.html>ST</a> : SAO TOME AND PRINCIPE<br>
-<a href=iso.SV.html>SV</a> : EL SALVADOR<br>
-<a href=iso.SY.html>SY</a> : SYRIAN ARAB REPUBLIC<br>
-<a href=iso.SZ.html>SZ</a> : SWAZILAND<br>
-<a href=iso.TC.html>TC</a> : TURKS AND CAICOS ISLANDS<br>
-<a href=iso.TD.html>TD</a> : CHAD<br>
-<a href=iso.TF.html>TF</a> : FRENCH SOUTHERN TERRITORIES<br>
-<a href=iso.TG.html>TG</a> : TOGO<br>
-<a href=iso.TH.html>TH</a> : THAILAND<br>
-<a href=iso.TJ.html>TJ</a> : TAJIKISTAN<br>
-<a href=iso.TK.html>TK</a> : TOKELAU<br>
-<a href=iso.TM.html>TM</a> : TURKMENISTAN<br>
-<a href=iso.TN.html>TN</a> : TUNISIA<br>
-<a href=iso.TO.html>TO</a> : TONGA<br>
-<a href=iso.TP.html>TP</a> : EAST TIMOR<br>
-<a href=iso.TR.html>TR</a> : TURKEY<br>
-<a href=iso.TT.html>TT</a> : TRINIDAD AND TOBAGO<br>
-<a href=iso.TV.html>TV</a> : TUVALU<br>
-<a href=iso.TW.html>TW</a> : TAIWAN, PROVINCE OF CHINA<br>
-<a href=iso.TZ.html>TZ</a> : TANZANIA, UNITED REPUBLIC OF<br>
-<a href=iso.UA.html>UA</a> : UKRAINE<br>
-<a href=iso.UG.html>UG</a> : UGANDA<br>
-<a href=iso.UM.html>UM</a> : UNITED STATES MINOR OUTLYING ISLANDS<br>
-<a href=iso.US.html>US</a> : UNITED STATES<br>
-<a href=iso.UY.html>UY</a> : URUGUAY<br>
-<a href=iso.UZ.html>UZ</a> : UZBEKISTAN<br>
-<a href=iso.VE.html>VE</a> : VENEZUELA<br>
-<a href=iso.VG.html>VG</a> : VIRGIN ISLANDS, BRITISH<br>
-<a href=iso.VI.html>VI</a> : VIRGIN ISLANDS, U.S.<br>
-<a href=iso.VN.html>VN</a> : VIET NAM<br>
-<a href=iso.VU.html>VU</a> : VANUATU<br>
-<a href=iso.WF.html>WF</a> : WALLIS AND FUTUNA<br>
-<a href=iso.WS.html>WS</a> : SAMOA<br>
-<a href=iso.YE.html>YE</a> : YEMEN<br>
-<a href=iso.YT.html>YT</a> : MAYOTTE<br>
-<a href=iso.YU.html>YU</a> : YUGOSLAVIA<br>
-<a href=iso.ZA.html>ZA</a> : SOUTH AFRICA<br>
-<a href=iso.ZM.html>ZM</a> : ZAMBIA<br>
-<a href=iso.ZW.html>ZW</a> : ZIMBABWE<br>
-</body></html>
+Name,Code
+Afghanistan,AF
+Åland Islands,AX
+Albania,AL
+Algeria,DZ
+American Samoa,AS
+Andorra,AD
+Angola,AO
+Anguilla,AI
+Antarctica,AQ
+Antigua and Barbuda,AG
+Argentina,AR
+Armenia,AM
+Aruba,AW
+Australia,AU
+Austria,AT
+Azerbaijan,AZ
+Bahamas,BS
+Bahrain,BH
+Bangladesh,BD
+Barbados,BB
+Belarus,BY
+Belgium,BE
+Belize,BZ
+Benin,BJ
+Bermuda,BM
+Bhutan,BT
+"Bolivia, Plurinational State of",BO
+"Bonaire, Sint Eustatius and Saba",BQ
+Bosnia and Herzegovina,BA
+Botswana,BW
+Bouvet Island,BV
+Brazil,BR
+British Indian Ocean Territory,IO
+Brunei Darussalam,BN
+Bulgaria,BG
+Burkina Faso,BF
+Burundi,BI
+Cambodia,KH
+Cameroon,CM
+Canada,CA
+Cape Verde,CV
+Cayman Islands,KY
+Central African Republic,CF
+Chad,TD
+Chile,CL
+China,CN
+Christmas Island,CX
+Cocos (Keeling) Islands,CC
+Colombia,CO
+Comoros,KM
+Congo,CG
+"Congo, the Democratic Republic of the",CD
+Cook Islands,CK
+Costa Rica,CR
+Côte d'Ivoire,CI
+Croatia,HR
+Cuba,CU
+Curaçao,CW
+Cyprus,CY
+Czech Republic,CZ
+Denmark,DK
+Djibouti,DJ
+Dominica,DM
+Dominican Republic,DO
+Ecuador,EC
+Egypt,EG
+El Salvador,SV
+Equatorial Guinea,GQ
+Eritrea,ER
+Estonia,EE
+Ethiopia,ET
+Falkland Islands (Malvinas),FK
+Faroe Islands,FO
+Fiji,FJ
+Finland,FI
+France,FR
+French Guiana,GF
+French Polynesia,PF
+French Southern Territories,TF
+Gabon,GA
+Gambia,GM
+Georgia,GE
+Germany,DE
+Ghana,GH
+Gibraltar,GI
+Greece,GR
+Greenland,GL
+Grenada,GD
+Guadeloupe,GP
+Guam,GU
+Guatemala,GT
+Guernsey,GG
+Guinea,GN
+Guinea-Bissau,GW
+Guyana,GY
+Haiti,HT
+Heard Island and McDonald Islands,HM
+Holy See (Vatican City State),VA
+Honduras,HN
+Hong Kong,HK
+Hungary,HU
+Iceland,IS
+India,IN
+Indonesia,ID
+"Iran, Islamic Republic of",IR
+Iraq,IQ
+Ireland,IE
+Isle of Man,IM
+Israel,IL
+Italy,IT
+Jamaica,JM
+Japan,JP
+Jersey,JE
+Jordan,JO
+Kazakhstan,KZ
+Kenya,KE
+Kiribati,KI
+"Korea, Democratic People's Republic of",KP
+"Korea, Republic of",KR
+Kuwait,KW
+Kyrgyzstan,KG
+Lao People's Democratic Republic,LA
+Latvia,LV
+Lebanon,LB
+Lesotho,LS
+Liberia,LR
+Libya,LY
+Liechtenstein,LI
+Lithuania,LT
+Luxembourg,LU
+Macao,MO
+"Macedonia, the Former Yugoslav Republic of",MK
+Madagascar,MG
+Malawi,MW
+Malaysia,MY
+Maldives,MV
+Mali,ML
+Malta,MT
+Marshall Islands,MH
+Martinique,MQ
+Mauritania,MR
+Mauritius,MU
+Mayotte,YT
+Mexico,MX
+"Micronesia, Federated States of",FM
+"Moldova, Republic of",MD
+Monaco,MC
+Mongolia,MN
+Montenegro,ME
+Montserrat,MS
+Morocco,MA
+Mozambique,MZ
+Myanmar,MM
+Namibia,NA
+Nauru,NR
+Nepal,NP
+Netherlands,NL
+New Caledonia,NC
+New Zealand,NZ
+Nicaragua,NI
+Niger,NE
+Nigeria,NG
+Niue,NU
+Norfolk Island,NF
+Northern Mariana Islands,MP
+Norway,NO
+Oman,OM
+Pakistan,PK
+Palau,PW
+"Palestine, State of",PS
+Panama,PA
+Papua New Guinea,PG
+Paraguay,PY
+Peru,PE
+Philippines,PH
+Pitcairn,PN
+Poland,PL
+Portugal,PT
+Puerto Rico,PR
+Qatar,QA
+Réunion,RE
+Romania,RO
+Russian Federation,RU
+Rwanda,RW
+Saint Barthélemy,BL
+"Saint Helena, Ascension and Tristan da Cunha",SH
+Saint Kitts and Nevis,KN
+Saint Lucia,LC
+Saint Martin (French part),MF
+Saint Pierre and Miquelon,PM
+Saint Vincent and the Grenadines,VC
+Samoa,WS
+San Marino,SM
+Sao Tome and Principe,ST
+Saudi Arabia,SA
+Senegal,SN
+Serbia,RS
+Seychelles,SC
+Sierra Leone,SL
+Singapore,SG
+Sint Maarten (Dutch part),SX
+Slovakia,SK
+Slovenia,SI
+Solomon Islands,SB
+Somalia,SO
+South Africa,ZA
+South Georgia and the South Sandwich Islands,GS
+South Sudan,SS
+Spain,ES
+Sri Lanka,LK
+Sudan,SD
+Suriname,SR
+Svalbard and Jan Mayen,SJ
+Swaziland,SZ
+Sweden,SE
+Switzerland,CH
+Syrian Arab Republic,SY
+"Taiwan, Province of China",TW
+Tajikistan,TJ
+"Tanzania, United Republic of",TZ
+Thailand,TH
+Timor-Leste,TL
+Togo,TG
+Tokelau,TK
+Tonga,TO
+Trinidad and Tobago,TT
+Tunisia,TN
+Turkey,TR
+Turkmenistan,TM
+Turks and Caicos Islands,TC
+Tuvalu,TV
+Uganda,UG
+Ukraine,UA
+United Arab Emirates,AE
+United Kingdom,GB
+United States,US
+United States Minor Outlying Islands,UM
+Uruguay,UY
+Uzbekistan,UZ
+Vanuatu,VU
+"Venezuela, Bolivarian Republic of",VE
+Viet Nam,VN
+"Virgin Islands, British",VG
+"Virgin Islands, U.S.",VI
+Wallis and Futuna,WF
+Western Sahara,EH
+Yemen,YE
+Zambia,ZM
+Zimbabwe,ZW
diff --git a/scriptlets/fetch_country_codes.sh b/scriptlets/fetch_country_codes.sh
index 8dae525..0850b77 100755
--- a/scriptlets/fetch_country_codes.sh
+++ b/scriptlets/fetch_country_codes.sh
@@ -3,8 +3,8 @@
 # store them locally to be used in compilation time.
 # This operation must be executed by hand when wanted to update
 # current ones shown in config page
-set -e 
+set -ex
 
 cd "$(dirname "$0")"
 
-curl -X GET http://geotags.com/iso3166/countries.html > country-codes
 \ No newline at end of file
+curl -X GET https://raw.githubusercontent.com/umpirsky/country-list/master/data/en_US/country.csv > country-codes
diff --git a/scriptlets/fill_country_codes.sh b/scriptlets/fill_country_codes.sh
index b8babe4..028b77a 100755
--- a/scriptlets/fill_country_codes.sh
+++ b/scriptlets/fill_country_codes.sh
@@ -4,9 +4,9 @@
 # Process is easy, get it from remote path, format using sed, and replace 
 # html page were they will be used
 
-set -e 
+set -e
 
-COUNTRY_CODES=../../../scriptlets/country-codes
+COUNTRY_CODES=./scriptlets/country-codes
 
 if [ ! -e $COUNTRY_CODES ]; then
     echo "======================================================="
@@ -19,21 +19,16 @@ if [ ! -e $COUNTRY_CODES ]; then
     exit 1
 fi
 
-# think that this is a scriptlet, executed in parts/<the_part>/build folder
-cp $COUNTRY_CODES .
-
-# remove non processable lines
-sed -i '/^<a href=iso/!d' country-codes
-
-# process lines to change its format to be html select options
-sed -i '/<a href=iso/ s/<a href=iso.*html>/<option value="/ 
-s/<\/a>\ :\ /">/
-s/<br>/<\/option>/' country-codes
+# remove first line and create html
+tail -n +2 $COUNTRY_CODES | sed 's/\r$//' |
+    while read -r ln; do
+        printf '<option value="%s">%s</option>\n' "${ln##*,}" "${ln%,*}"
+    done > country-codes
 
 # add world wide default option at beginning
 sed -i '1s;^;<option value="XX">\-WORLD WIDE\-<\/option>\n;' country-codes
 
 # replace mark in management.html template with real country-codes
-sed -e '/\[COUNTRY_CODE_OPTIONS\]/ {' -e 'r country-codes' -e 'd' -e '}' -i static/templates/management.html 
+sed -e '/\[COUNTRY_CODE_OPTIONS\]/ {' -e 'r country-codes' -e 'd' -e '}' -i static/templates/management.html
 
 echo "country codes filled ok"
diff --git a/server/handlers.go b/server/handlers.go
index 45ec7fe..b7e71ff 100644
--- a/server/handlers.go
+++ b/server/handlers.go
@@ -24,10 +24,8 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
-	"text/template"
-	"time"
-
 	"strconv"
+	"text/template"
 
 	"launchpad.net/wifi-connect/utils"
 )
@@ -42,9 +40,6 @@ const (
 // ResourcesPath absolute path to web static resources
 var ResourcesPath = filepath.Join(os.Getenv("SNAP"), "static")
 
-// first time management portal is accessed this file is created.
-var firstConfigFlagFile = filepath.Join(os.Getenv("SNAP_COMMON"), ".first_config")
-
 var cw interface{}
 
 // Data interface representing any data included in a template
@@ -66,7 +61,36 @@ type ConnectingData struct {
 	Ssid string
 }
 
-type noData struct {
+// UserEvent stores data from events generated by the user, that is
+// sent back to the service main loop
+type UserEvent struct {
+	EvType int
+	Params map[string]string
+}
+
+// Event types for UserEvent.evType
+const (
+	UserEventConnect = 0 + iota
+	UserEventRefresh
+	UserEventDisconnect
+)
+
+// Parameters for UserEventConnect
+const (
+	UeConnSsid     = "ssid"
+	UeConnPassword = "password"
+)
+
+// ManagementServer models the management server
+type ManagementServer struct {
+	chUserEvs chan<- UserEvent
+	config    utils.Config
+	ssidLs    *utils.SsidList
+}
+
+// OperationalServer models the operational server
+type OperationalServer struct {
+	chUserEvs chan<- UserEvent
 }
 
 func execTemplate(w http.ResponseWriter, templatePath string, data Data) {
@@ -81,7 +105,7 @@ func execTemplate(w http.ResponseWriter, templatePath string, data Data) {
 
 	err = t.Execute(w, data)
 	if err != nil {
-		msg := fmt.Sprintf("Error executing the template at %v : %v", templatePath, err)
+		msg := fmt.Sprintf("Error executing the template at %v: %v", templatePath, err)
 		log.Print(msg)
 		http.Error(w, msg, http.StatusInternalServerError)
 		return
@@ -89,53 +113,36 @@ func execTemplate(w http.ResponseWriter, templatePath string, data Data) {
 }
 
 // ManagementHandler handles management portal
-func ManagementHandler(w http.ResponseWriter, r *http.Request) {
+func (ms *ManagementServer) ManagementHandler(w http.ResponseWriter, r *http.Request) {
 
 	if utils.MustSetConfig() {
 
-		config, err := utils.ReadConfig()
-		if err != nil {
-			msg := fmt.Sprintf("Error reading configuration: %v", err)
-			log.Println(msg)
-			http.Error(w, msg, http.StatusInternalServerError)
-			return
-		}
-
-		if !config.Portal.NoResetCredentials {
-			execTemplate(w, managementTemplatePath, ManagementData{Config: config, Page: "config"})
+		if !ms.config.Portal.NoResetCredentials {
+			execTemplate(w, managementTemplatePath,
+				ManagementData{Config: &ms.config, Page: "config"})
 			return
 		}
 
 	}
 
-	ssids, err := utils.ReadSsidsFile()
-	if err != nil {
-		log.Printf("Error reading SSIDs file: %v", err)
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	execTemplate(w, managementTemplatePath, ManagementData{Ssids: ssids, Page: "ssids"})
+	execTemplate(w, managementTemplatePath,
+		ManagementData{Ssids: ms.ssidLs.GetSsidList(), Page: "ssids"})
 }
 
 // SaveConfigHandler saves config received as form post parameters
-func SaveConfigHandler(w http.ResponseWriter, r *http.Request) {
-	// read previous config
-	config, err := utils.ReadConfig()
-	if err != nil {
-		msg := fmt.Sprintf("Error reading previous stored config: %v", err)
-		log.Println(msg)
-		http.Error(w, msg, http.StatusInternalServerError)
-		return
-	}
+func (ms *ManagementServer) SaveConfigHandler(w http.ResponseWriter, r *http.Request) {
+	// start from previous config
+	config := ms.config
 
 	r.ParseForm()
 
+	var err error
 	config.Wifi.Ssid = utils.ParseFormParamSingleValue(r.Form, "Ssid")
 	config.Wifi.Passphrase = utils.ParseFormParamSingleValue(r.Form, "Passphrase")
 	config.Wifi.Interface = utils.ParseFormParamSingleValue(r.Form, "Interface")
 	config.Wifi.CountryCode = utils.ParseFormParamSingleValue(r.Form, "CountryCode")
-	config.Wifi.Channel, err = strconv.Atoi(utils.ParseFormParamSingleValue(r.Form, "Channel"))
+	config.Wifi.Channel, err = strconv.Atoi(
+		utils.ParseFormParamSingleValue(r.Form, "Channel"))
 	if err != nil {
 		msg := fmt.Sprintf("Error parsing channel form value: %v", err)
 		log.Println(msg)
@@ -145,7 +152,7 @@ func SaveConfigHandler(w http.ResponseWriter, r *http.Request) {
 	config.Wifi.OperationMode = utils.ParseFormParamSingleValue(r.Form, "OperationMode")
 	config.Portal.Password = utils.ParseFormParamSingleValue(r.Form, "PortalPassword")
 
-	err = utils.WriteConfig(config)
+	err = utils.WriteConfig(&config)
 	if err != nil {
 		msg := fmt.Sprintf("Error saving config: %v", err)
 		log.Println(msg)
@@ -153,20 +160,12 @@ func SaveConfigHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	//after saving config, redirect to management portal, showing available ssids
-	ssids, err := utils.ReadSsidsFile()
-	if err != nil {
-		msg := fmt.Sprintf("== wifi-connect/handler: Error reading SSIDs file: %v\n", err)
-		log.Println(msg)
-		http.Error(w, msg, http.StatusInternalServerError)
-		return
-	}
-
-	execTemplate(w, managementTemplatePath, ManagementData{Ssids: ssids, Page: "ssids"})
+	execTemplate(w, managementTemplatePath,
+		ManagementData{Ssids: ms.ssidLs.GetSsidList(), Page: "ssids"})
 }
 
 // ConnectHandler reads form got ssid and password and tries to connect to that network
-func ConnectHandler(w http.ResponseWriter, r *http.Request) {
+func (ms *ManagementServer) ConnectHandler(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
 
 	pwd := ""
@@ -184,55 +183,15 @@ func ConnectHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	ssid := ssids[0]
 
-	go func() {
-		log.Printf("Connecting to %v", ssid)
-
-		// While the connecting is attempted, the flag file must be
-		// present so the service loops harmlessly
-		waitPath := os.Getenv("SNAP_COMMON") + "/startingApConnect"
-		err1 := utils.WriteFlagFile(waitPath)
-		if err1 != nil {
-			log.Print("Error writing flag file")
-			return
-		}
-
-		err := wifiapClient.Disable()
-		if err != nil {
-			msg := fmt.Sprintf("Error disabling AP: %v", err)
-			log.Print(msg)
-			http.Error(w, msg, http.StatusInternalServerError)
-			return
-		}
-
-		// manage iface by netman
-		netmanClient.SetIfaceManaged("wlan0", true, netmanClient.GetWifiDevices(netmanClient.GetDevices()))
-		_, ap2device, ssid2ap := netmanClient.Ssids()
-
-		// attempt to connect to external AP
-		err = netmanClient.ConnectAp(ssid, pwd, ap2device, ssid2ap)
-		//TODO signal user in portal on failure to connect
-		if err != nil {
-			msg := fmt.Sprintf("Failed connecting to %v", ssid)
-			log.Println(msg)
-			netmanClient.DeleteWifiConnections()
-			//note that this call takes time, perhaps a couple minutes, so
-			//deleting the wait file happens after, which means it takes a couple
-			//minutes for the wifi-connect service to restor system to Management
-			//mode
-			http.Error(w, msg, http.StatusInternalServerError)
-			//remove WAIT flag file so that daemon starts checking state
-			//and takes control again
-			waitPath := os.Getenv("SNAP_COMMON") + "/startingApConnect"
-			utils.RemoveFlagFile(waitPath)
-		}
-	}()
+	ms.chUserEvs <- UserEvent{EvType: UserEventConnect,
+		Params: map[string]string{UeConnSsid: ssid, UeConnPassword: pwd}}
 }
 
 type disconnectData struct {
 }
 
 // OperationalHandler display Opertational mode page
-func OperationalHandler(w http.ResponseWriter, r *http.Request) {
+func (os *OperationalServer) OperationalHandler(w http.ResponseWriter, r *http.Request) {
 	data := disconnectData{}
 	execTemplate(w, operationalTemplatePath, data)
 }
@@ -242,8 +201,8 @@ type hashResponse struct {
 	HashMatch bool
 }
 
-// HashItHandler returns a hash of the password as json
-func HashItHandler(w http.ResponseWriter, r *http.Request) {
+// hashItHandler returns a hash of the password as json
+func hashItHandler(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
 	hashMe := r.Form["Hash"]
 	hashed, errH := utils.MatchingHash(hashMe[0])
@@ -262,52 +221,31 @@ func HashItHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(b)
 }
 
+// HashItHandler hashes the password
+func (os *OperationalServer) HashItHandler(w http.ResponseWriter, r *http.Request) {
+	hashItHandler(w, r)
+}
+
+// HashItHandler hashes the password
+func (ms *ManagementServer) HashItHandler(w http.ResponseWriter, r *http.Request) {
+	hashItHandler(w, r)
+}
+
 // DisconnectHandler allows user to disconnect from external AP
-func DisconnectHandler(w http.ResponseWriter, r *http.Request) {
-	netmanClient.DisconnectWifi(netmanClient.GetWifiDevices(netmanClient.GetDevices()))
+func (os *OperationalServer) DisconnectHandler(w http.ResponseWriter, r *http.Request) {
+	os.chUserEvs <- UserEvent{EvType: UserEventDisconnect}
 }
 
 // RefreshHandler handles ssids refreshment
-func RefreshHandler(w http.ResponseWriter, r *http.Request) {
+func (ms *ManagementServer) RefreshHandler(w http.ResponseWriter, r *http.Request) {
 
 	// show same page. After refresh operation, management page should show a refresh alert
-	ManagementHandler(w, r)
-
-	go func() {
-		if err := netmanClient.Unmanage(); err != nil {
-			fmt.Println(err)
-			return
-		}
-
-		apUp, err := wifiapClient.Enabled()
-		if err != nil {
-			fmt.Println(Sprintf("An error happened while requesting current AP status: %v\n", err))
-			return
-		}
-
-		if apUp {
-			err := wifiapClient.Disable()
-			if err != nil {
-				fmt.Println(Sprintf("An error happened while bringing AP down: %v\n", err))
-				return
-			}
-		}
+	ms.ManagementHandler(w, r)
 
-		for found := netmanClient.ScanAndWriteSsidsToFile(utils.SsidsFile); !found; found = netmanClient.ScanAndWriteSsidsToFile(utils.SsidsFile) {
-			time.Sleep(5 * time.Second)
-		}
-
-		if err := netmanClient.Unmanage(); err != nil {
-			fmt.Println(err)
-			return
-		}
-
-		err = wifiapClient.Enable()
-		if err != nil {
-			fmt.Println(Sprintf("An error happened while bringing AP up: %v\n", err))
-			return
-		}
+	ms.chUserEvs <- UserEvent{EvType: UserEventRefresh}
+}
 
-		fmt.Println("== wifi-connect/RefreshHandler: starting wifi-ap")
-	}()
+// RedirectHandler redirects to our main URL
+func (ms *ManagementServer) RedirectHandler(w http.ResponseWriter, r *http.Request) {
+	http.Redirect(w, r, "http://device-wifi-connect.com", http.StatusFound)
 }
diff --git a/server/handlers_test.go b/server/handlers_test.go
index f4278b7..27a81e3 100644
--- a/server/handlers_test.go
+++ b/server/handlers_test.go
@@ -26,124 +26,19 @@ import (
 	"strings"
 	"testing"
 
-	"launchpad.net/wifi-connect/netman"
 	"launchpad.net/wifi-connect/utils"
 )
 
-type wifiapClientMock struct{}
-
-func (c *wifiapClientMock) Show() (map[string]interface{}, error) {
-	return nil, nil
-}
-
-func (c *wifiapClientMock) Enable() error {
-	return nil
-}
-
-func (c *wifiapClientMock) Disable() error {
-	return nil
-}
-
-func (c *wifiapClientMock) Enabled() (bool, error) {
-	return true, nil
-}
-
-func (c *wifiapClientMock) SetSsid(string) error {
-	return nil
-}
-
-func (c *wifiapClientMock) SetPassphrase(string) error {
-	return nil
-}
-
-func (c *wifiapClientMock) Set(map[string]interface{}) error {
-	return nil
-}
-
-type netmanClientMock struct{}
-
-func (c *netmanClientMock) GetDevices() []string {
-	return []string{"/d/1"}
-}
-
-func (c *netmanClientMock) GetWifiDevices(devices []string) []string {
-	return []string{"/d/1"}
-}
-
-func (c *netmanClientMock) GetAccessPoints(devices []string, ap2device map[string]string) []string {
-	return []string{"/ap/1"}
-}
-
-func (c *netmanClientMock) ConnectAp(ssid string, p string, ap2device map[string]string, ssid2ap map[string]string) error {
-	return nil
-}
-
-func (c *netmanClientMock) Ssids() ([]netman.SSID, map[string]string, map[string]string) {
-	myssid := netman.SSID{Ssid: "myssid", ApPath: "/ap/1"}
-	return []netman.SSID{myssid}, map[string]string{"/ap/1": "/d/1"}, map[string]string{"myssid": "/ap/1"}
-}
-
-func (c *netmanClientMock) Connected(devices []string) bool {
-	return false
-}
-
-func (c *netmanClientMock) ConnectedWifi(wifiDevices []string) bool {
-	return false
-}
-
-func (c *netmanClientMock) DisconnectWifi(wifiDevices []string) int {
-	return 0
-}
-
-func (c *netmanClientMock) SetIfaceManaged(iface string, state bool, devices []string) string {
-	return "wlan0"
-}
-
-func (c *netmanClientMock) WifisManaged(wifiDevices []string) (map[string]string, error) {
-	return map[string]string{"wlan0": "/d/1"}, nil
-}
-func (c *netmanClientMock) Unmanage() error {
-	return nil
-}
-func (c *netmanClientMock) Manage() error {
-	return nil
-}
-
-func (c *netmanClientMock) ScanAndWriteSsidsToFile(filepath string) bool {
-	return true
-}
-
-func (c *netmanClientMock) DeleteWifiConnections() {}
-
 func TestManagementHandler(t *testing.T) {
-
-	// mock settings to not to ask for saving a first configuration
-	utils.ReadConfig = func() (*utils.Config, error) {
-		return &utils.Config{
-			Wifi: &utils.WifiConfig{
-				Ssid:          "Ubuntu",
-				Passphrase:    "17Soj8/Sxh14lcpD",
-				Interface:     "wlp2s0",
-				CountryCode:   "0x31",
-				Channel:       6,
-				OperationMode: "g",
-			},
-			Portal: &utils.PortalConfig{
-				Password:           "the_password",
-				NoResetCredentials: true,
-				NoOperational:      false,
-			},
-		}, nil
-	}
-	utils.MustSetConfig = func() bool { return false }
+	chUserEvs := make(chan UserEvent)
+	ms := &ManagementServer{chUserEvs: chUserEvs, config: utils.Config{},
+		ssidLs: &utils.SsidList{}}
 
 	ResourcesPath = "../static"
-	SsidsFile := "../static/tests/ssids"
-	utils.SetSsidsFile(SsidsFile)
 
 	w := httptest.NewRecorder()
 	r, _ := http.NewRequest("GET", "/", nil)
-	http.HandlerFunc(ManagementHandler).ServeHTTP(w, r)
+	http.HandlerFunc(ms.ManagementHandler).ServeHTTP(w, r)
 
 	if w.Code != http.StatusOK {
 		t.Errorf("Expected status %d, got: %d", http.StatusOK, w.Code)
@@ -155,9 +50,9 @@ func TestManagementHandler(t *testing.T) {
 }
 
 func TestConnectHandler(t *testing.T) {
-
-	wifiapClient = &wifiapClientMock{}
-	netmanClient = &netmanClientMock{}
+	chUserEvs := make(chan UserEvent)
+	ms := &ManagementServer{chUserEvs: chUserEvs, config: utils.Config{},
+		ssidLs: &utils.SsidList{}}
 
 	ResourcesPath = "../static"
 
@@ -169,7 +64,21 @@ func TestConnectHandler(t *testing.T) {
 	r, _ := http.NewRequest("POST", "/connect", bytes.NewBufferString(form.Encode()))
 	r.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 	r.Header.Add("Content-Length", strconv.Itoa(len(form.Encode())))
-	http.HandlerFunc(ConnectHandler).ServeHTTP(w, r)
+
+	go func() {
+		uEv := <-chUserEvs
+		if uEv.EvType != UserEventConnect {
+			t.Errorf("Bad event %v", uEv.EvType)
+		}
+		if uEv.Params[UeConnSsid] != "myssid" {
+			t.Errorf("Bad ssid: %s", uEv.Params[UeConnSsid])
+		}
+		if uEv.Params[UeConnPassword] != "mypassphrase" {
+			t.Errorf("Bad password: %s", uEv.Params[UeConnPassword])
+		}
+	}()
+
+	http.HandlerFunc(ms.ConnectHandler).ServeHTTP(w, r)
 
 	if w.Code != http.StatusOK {
 		t.Errorf("Expected status %d, got: %d", http.StatusOK, w.Code)
@@ -177,14 +86,21 @@ func TestConnectHandler(t *testing.T) {
 }
 
 func TestDisconnectHandler(t *testing.T) {
-
-	netmanClient = &netmanClientMock{}
-
+	chUserEvs := make(chan UserEvent)
+	os := &OperationalServer{chUserEvs: chUserEvs}
 	ResourcesPath = "../static"
 
 	w := httptest.NewRecorder()
 	r, _ := http.NewRequest("GET", "/disconnect", nil)
-	http.HandlerFunc(DisconnectHandler).ServeHTTP(w, r)
+
+	go func() {
+		uEv := <-chUserEvs
+		if uEv.EvType != UserEventDisconnect {
+			t.Errorf("Bad event %v", uEv.EvType)
+		}
+	}()
+
+	http.HandlerFunc(os.DisconnectHandler).ServeHTTP(w, r)
 
 	if w.Code != http.StatusOK {
 		t.Errorf("Expected status %d, got: %d", http.StatusOK, w.Code)
@@ -192,17 +108,22 @@ func TestDisconnectHandler(t *testing.T) {
 }
 
 func TestRefreshHandler(t *testing.T) {
-
-	wifiapClient = &wifiapClientMock{}
-	netmanClient = &netmanClientMock{}
-
+	chUserEvs := make(chan UserEvent)
+	ms := &ManagementServer{chUserEvs: chUserEvs, config: utils.Config{},
+		ssidLs: &utils.SsidList{}}
 	ResourcesPath = "../static"
-	SsidsFile := "../static/tests/ssids"
-	utils.SetSsidsFile(SsidsFile)
 
 	w := httptest.NewRecorder()
 	r, _ := http.NewRequest("GET", "/refresh", nil)
-	http.HandlerFunc(RefreshHandler).ServeHTTP(w, r)
+
+	go func() {
+		uEv := <-chUserEvs
+		if uEv.EvType != UserEventRefresh {
+			t.Errorf("Bad event %v", uEv.EvType)
+		}
+	}()
+
+	http.HandlerFunc(ms.RefreshHandler).ServeHTTP(w, r)
 
 	if w.Code != http.StatusOK {
 		t.Errorf("Expected status %d, got: %d", http.StatusOK, w.Code)
@@ -214,11 +135,13 @@ func TestRefreshHandler(t *testing.T) {
 }
 
 func TestOperationalHandler(t *testing.T) {
+	chUserEvs := make(chan UserEvent)
+	os := &OperationalServer{chUserEvs: chUserEvs}
 	ResourcesPath = "../static"
 
 	w := httptest.NewRecorder()
 	r, _ := http.NewRequest("GET", "/", nil)
-	http.HandlerFunc(OperationalHandler).ServeHTTP(w, r)
+	http.HandlerFunc(os.OperationalHandler).ServeHTTP(w, r)
 
 	if w.Code != http.StatusOK {
 		t.Errorf("Expected status %d, got: %d", http.StatusOK, w.Code)
@@ -230,83 +153,17 @@ func TestOperationalHandler(t *testing.T) {
 }
 
 func TestInvalidTemplateHandler(t *testing.T) {
+	chUserEvs := make(chan UserEvent)
+	ms := &ManagementServer{chUserEvs: chUserEvs, config: utils.Config{},
+		ssidLs: &utils.SsidList{}}
 
 	ResourcesPath = "/invalidpath"
 
 	w := httptest.NewRecorder()
 	r, _ := http.NewRequest("GET", "/", nil)
-	http.HandlerFunc(ManagementHandler).ServeHTTP(w, r)
+	http.HandlerFunc(ms.ManagementHandler).ServeHTTP(w, r)
 
 	if w.Code != http.StatusInternalServerError {
 		t.Errorf("Expected status %d, got: %d", http.StatusInternalServerError, w.Code)
 	}
 }
-
-func TestReadSsidsFile(t *testing.T) {
-
-	SsidsFile := "../static/tests/ssids"
-	utils.SetSsidsFile(SsidsFile)
-	ssids, err := utils.ReadSsidsFile()
-	if err != nil {
-		t.Errorf("Unexpected error reading ssids file: %v", err)
-	}
-
-	if len(ssids) != 4 {
-		t.Error("Expected 4 elements in csv record")
-	}
-
-	set := make(map[string]bool)
-	for _, v := range ssids {
-		set[v] = true
-	}
-
-	if !set["mynetwork"] {
-		t.Error("mynetwork value not found")
-	}
-	if !set["yournetwork"] {
-		t.Error("yournetwork value not found")
-	}
-	if !set["hernetwork"] {
-		t.Error("hernetwork value not found")
-	}
-	if !set["hisnetwork"] {
-		t.Error("hisnetwork value not found")
-	}
-}
-
-func TestReadSsidsFileWithOnlyOne(t *testing.T) {
-
-	SsidsFile := "../static/tests/ssids_onlyonessid"
-	utils.SetSsidsFile(SsidsFile)
-	ssids, err := utils.ReadSsidsFile()
-	if err != nil {
-		t.Errorf("Unexpected error reading ssids file: %v", err)
-	}
-
-	if len(ssids) != 1 {
-		t.Error("Expected 1 elements in csv record")
-	}
-
-	set := make(map[string]bool)
-	for _, v := range ssids {
-		set[v] = true
-	}
-
-	if !set["mynetwork"] {
-		t.Error("mynetwork value not found")
-	}
-}
-
-func TestReadEmptySsidsFile(t *testing.T) {
-
-	SsidsFile := "../static/tests/ssids_empty"
-	utils.SetSsidsFile(SsidsFile)
-	ssids, err := utils.ReadSsidsFile()
-	if err != nil {
-		t.Errorf("Unexpected error reading ssids file: %v", err)
-	}
-
-	if len(ssids) != 0 {
-		t.Error("Expected 0 elements in csv record")
-	}
-}
diff --git a/server/launcher.go b/server/launcher.go
index 7317df0..3615781 100644
--- a/server/launcher.go
+++ b/server/launcher.go
@@ -19,118 +19,50 @@ package server
 
 import (
 	"log"
-	"net"
 	"net/http"
-	"time"
-
-	"launchpad.net/wifi-connect/utils"
+	"strconv"
 )
 
+// RunningState enum defining which server is up and running
+type RunningState int
+
 // Server running state
 const (
-	Stopped RunningState = 0 + iota
-	Starting
+	Stopped RunningState = iota
 	Running
-	Stopping
 )
 
-const (
-	// TestingAddress listening point for testing servers
-	TestingAddress = ":8081"
-)
-
-// RunningState enum defining which server is up and running
-type RunningState int
-
-// Address where server is listening
-var Address = ":8080"
-
 // State holds current server state
 var State = Stopped
 
-var listener net.Listener
+var server *http.Server
 var done chan bool
 
-type tcpKeepAliveListener struct {
-	*net.TCPListener
-}
-
-// WaitForState waits for server reach certain state
-func WaitForState(state RunningState) bool {
-	retries := 10
-	idle := 10 * time.Millisecond
-	for ; retries > 0 && State != state; retries-- {
-		time.Sleep(idle)
-		idle *= 2
-	}
-	return State == state
-}
-
-// Accept accepts incoming tcp connections
-func (ln tcpKeepAliveListener) Accept() (net.Conn, error) {
-	tc, err := ln.AcceptTCP()
-	if err != nil {
-		return tc, err
-	}
-	tc.SetKeepAlive(true)
-	tc.SetKeepAlivePeriod(3 * time.Minute)
-	return tc, nil
-}
-
-func listenAndServe(addr string, handler http.Handler) error {
+func listenAndServe(port int, handler http.Handler) error {
 
 	if State != Stopped {
-		return Errorf("Server is not in proper stopped state before trying to start it")
-	}
-
-	if utils.RunningOn(addr) {
-		return Errorf("Another instance is running in same address %v", addr)
+		return Errorf("Server is not in stopped state before trying to start it")
 	}
 
-	State = Starting
-
-	srv := &http.Server{Addr: addr, Handler: handler}
-	// channel needed to communicate real server shutdown, as after calling listener.Close()
-	// it can take several milliseconds to really stop the listening.
+	server = &http.Server{Addr: ":" + strconv.Itoa(port), Handler: handler}
+	// channel needed to communicate real server shutdown, as after calling
+	// server.Close() it can take several milliseconds to really stop the
+	// listening.
 	done = make(chan bool)
 
-	var err error
-	listener, err = net.Listen("tcp", addr)
-	if err != nil {
-		return err
-	}
-
-	// launch goroutine to check server state changes after startup is triggered
-	go func() {
-		retries := 10
-		idle := 10 * time.Millisecond
-		for ; !utils.RunningOn(addr) && retries > 0; retries-- {
-			time.Sleep(idle)
-			idle *= 2
-		}
-
-		if retries == 0 {
-			log.Print("Server could not be started")
-			return
-		}
-
-		State = Running
-	}()
-
 	// launching server in a goroutine for not blocking
-	go func() {
-		if listener != nil {
-			err := srv.Serve(tcpKeepAliveListener{listener.(*net.TCPListener)})
-			if err != nil {
-				log.Printf("HTTP Server closing - %v", err)
-			}
-			// notify server real stop
-			done <- true
+	go func(server *http.Server) {
+		err := server.ListenAndServe()
+		if err != nil {
+			log.Printf("HTTP Server closing - %v", err)
 		}
+		// notify server real stop
+		done <- true
 
 		close(done)
-	}()
+	}(server)
 
+	State = Running
 	return nil
 }
 
@@ -140,18 +72,16 @@ func stop() error {
 		return Errorf("Already stopped")
 	}
 
-	if listener == nil {
+	if server == nil {
 		State = Stopped
 		return Errorf("Already closed")
 	}
 
-	State = Stopping
-
-	err := listener.Close()
+	err := server.Close()
 	if err != nil {
 		return err
 	}
-	listener = nil
+	server = nil
 
 	// wait for server real shutdown confirmation
 	<-done
diff --git a/server/launcher_test.go b/server/launcher_test.go
index c377c79..eb252d3 100644
--- a/server/launcher_test.go
+++ b/server/launcher_test.go
@@ -19,77 +19,24 @@ package server
 
 import (
 	"testing"
+	"time"
 
-	telnet "github.com/reiver/go-telnet"
+	"launchpad.net/wifi-connect/utils"
 )
 
 func TestLaunchAndStop(t *testing.T) {
+	thePort := 8444
 
-	thePort := ":14444"
-
-	err := listenAndServe(thePort, nil)
-	if err != nil {
-		t.Errorf("Start server failed: %v", err)
-	}
-
-	// telnet to check server is alive
-	caller := telnet.StandardCaller
-	err = telnet.DialToAndCall("localhost"+thePort, caller)
-	if err != nil {
-		t.Errorf("Failed to telnet localhost server at port %v: %v", thePort, err)
-	}
-
-	err = stop()
-	if err != nil {
-		t.Errorf("Stop server error: %v", err)
-	}
-}
-
-// This test is being skipped because of a problem with jenkins where it fails.
-// We cannot reproduce the failure outside of jenkins. Additionally, we are
-// changing the http server and will not track state in the same way in the future.
-// These tests will change.
-func SkipTestStates(t *testing.T) {
-
-	WaitForState(Stopped)
-
-	if State != Stopped {
-		t.Error("Not in initial state")
-	}
-
-	thePort := ":14444"
-
-	err := listenAndServe(thePort, nil)
+	chUserEvs := make(chan UserEvent)
+	err := listenAndServe(thePort, managementHandler(chUserEvs,
+		&utils.Config{}, &utils.SsidList{}))
 	if err != nil {
 		t.Errorf("Start server failed: %v", err)
 	}
 
-	if State != Starting && State != Running {
-		t.Error("Not in proper start(ing) state")
-	}
-
-	WaitForState(Running)
-
-	// try a bad transition
-	err = listenAndServe(thePort, nil)
-	if err == nil {
-		t.Error("An error should be thrown when trying to start an already running instance")
-	}
-
+	time.Sleep(1 * time.Second)
 	err = stop()
 	if err != nil {
 		t.Errorf("Stop server error: %v", err)
 	}
-
-	if State != Stopping && State != Stopped {
-		t.Error("Not in proper stop(ing) state")
-	}
-
-	WaitForState(Stopped)
-
-	// try bad transitions
-	err = stop()
-	if err == nil {
-		t.Error("An error should be thrown when trying to stop a stopped instance")
-	}
 }
diff --git a/server/manager.go b/server/manager.go
index 6b11c23..c668974 100644
--- a/server/manager.go
+++ b/server/manager.go
@@ -18,8 +18,6 @@
 package server
 
 import (
-	"os"
-
 	"launchpad.net/wifi-connect/utils"
 )
 
@@ -37,23 +35,20 @@ type Server int
 var Current = None
 
 // StartManagementServer starts server in management mode
-func StartManagementServer() error {
+func StartManagementServer(chUserEvs chan<- UserEvent, config *utils.Config,
+	ssidLs *utils.SsidList) error {
+
 	if Current != None {
 		Current = None
-		return Errorf("Not in a valid status. Please stop first any other server instance before starting this one")
+		return Errorf("Invalid state: other server is running")
 	}
 
 	// change current instance asap we manage this server
 	Current = Management
 
-	waitPath := os.Getenv("SNAP_COMMON") + "/startingApConnect"
-	err := utils.WriteFlagFile(waitPath)
-	if err != nil {
-		Current = None
-		return err
-	}
-
-	err = listenAndServe(Address, managementHandler())
+	// Pass around program config to handlers
+	err := listenAndServe(config.Portal.Port,
+		managementHandler(chUserEvs, config, ssidLs))
 	if err != nil {
 		Current = None
 		return err
@@ -63,15 +58,15 @@ func StartManagementServer() error {
 }
 
 // StartOperationalServer starts server in operational mode
-func StartOperationalServer() error {
+func StartOperationalServer(chUserEvs chan<- UserEvent, config *utils.Config) error {
 	if Current != None {
-		return Errorf("Not in a valid status. Please stop first any other server instance before starting this one")
+		return Errorf("Invalid state: other server is running")
 	}
 
 	// change current instance asap we manage this server
 	Current = Operational
 
-	err := listenAndServe(Address, operationalHandler())
+	err := listenAndServe(config.Portal.Port, operationalHandler(chUserEvs))
 	if err != nil {
 		Current = None
 		return err
@@ -80,9 +75,10 @@ func StartOperationalServer() error {
 	return nil
 }
 
-// ShutdownManagementServer shutdown server management mode. If management server is not up, returns error
+// ShutdownManagementServer shutdown server management mode. If management
+// server is not up, returns error
 func ShutdownManagementServer() error {
-	if Current != Management || (State != Running && State != Starting) {
+	if Current != Management || State != Running {
 		return Errorf("Trying to stop management server when it is not running")
 	}
 
@@ -95,9 +91,10 @@ func ShutdownManagementServer() error {
 	return nil
 }
 
-// ShutdownOperationalServer shutdown server operational mode. If operational server is not up, returns error
+// ShutdownOperationalServer shutdown server operational mode. If operational
+// server is not up, returns error
 func ShutdownOperationalServer() error {
-	if Current != Operational || (State != Running && State != Starting) {
+	if Current != Operational || State != Running {
 		return Errorf("Trying to stop operational server when it is not running")
 	}
 
diff --git a/server/manager_test.go b/server/manager_test.go
index ea0661e..dbb38ae 100644
--- a/server/manager_test.go
+++ b/server/manager_test.go
@@ -1,29 +1,28 @@
 package server
 
 import (
-	"os"
 	"testing"
+	"time"
+
+	"launchpad.net/wifi-connect/utils"
 )
 
 func TestBasicServerTransitionStates(t *testing.T) {
 
-	Address = ":14444"
-
-	os.Setenv("SNAP_COMMON", os.TempDir())
-
 	if Current != None || State != Stopped {
 		t.Errorf("Server is not in initial state")
 	}
 
-	if err := StartManagementServer(); err != nil {
+	chUserEvs := make(chan UserEvent)
+	cfg := utils.Config{Portal: utils.PortalConfig{Port: 14444}}
+	if err := StartManagementServer(chUserEvs, &cfg, &utils.SsidList{}); err != nil {
 		t.Errorf("Error starting management server %v", err)
 	}
-	if Current != Management || (State != Starting && State != Running) {
+	if Current != Management || State != Running {
 		t.Errorf("Server is not in starting or in management status")
 	}
 
-	WaitForState(Running)
-
+	time.Sleep(1 * time.Second)
 	if err := ShutdownManagementServer(); err != nil {
 		t.Errorf("Error stopping management server %v", err)
 	}
@@ -32,17 +31,14 @@ func TestBasicServerTransitionStates(t *testing.T) {
 		t.Errorf("Current server is not None")
 	}
 
-	WaitForState(Stopped)
-
-	if err := StartOperationalServer(); err != nil {
+	if err := StartOperationalServer(chUserEvs, &cfg); err != nil {
 		t.Errorf("Error starting operational server %v", err)
 	}
-	if Current != Operational || (State != Starting && State != Running) {
+	if Current != Operational || State != Running {
 		t.Errorf("Server is not in starting or in operational status")
 	}
 
-	WaitForState(Running)
-
+	time.Sleep(1 * time.Second)
 	if err := ShutdownOperationalServer(); err != nil {
 		t.Errorf("Error stopping operational server %v", err)
 	}
@@ -52,31 +48,26 @@ func TestBasicServerTransitionStates(t *testing.T) {
 }
 
 func TestEdgeServerTransitionStates(t *testing.T) {
-
-	Address = ":14444"
-
-	os.Setenv("SNAP_COMMON", os.TempDir())
-
 	if Current != None {
 		t.Errorf("Server is not in initial state")
 	}
 
-	if err := StartManagementServer(); err != nil {
+	chUserEvs := make(chan UserEvent)
+	cfg := utils.Config{Portal: utils.PortalConfig{Port: 14444}}
+	if err := StartManagementServer(chUserEvs, &cfg, &utils.SsidList{}); err != nil {
 		t.Errorf("Error starting management server %v", err)
 	}
-	if Current != Management || (State != Starting && State != Running) {
+	if Current != Management || State != Running {
 		t.Errorf("Server is not in starting or in management status")
 	}
 
-	WaitForState(Running)
-
 	// start operational server without stopping management must throw an error
 	if err := StartOperationalServer; err == nil {
-		t.Errorf(`Expected an error when trying to launch one server instance having 
-		the other active`)
+		t.Errorf("No error when trying to launch one server instance having " +
+			"the other active")
 	}
 	if Current != Management {
-		t.Errorf("Server is not in management status after failed start operational server")
+		t.Errorf("Not in management status after failed start operational server")
 	}
 
 	// stop wrong server must throw an error
@@ -84,9 +75,10 @@ func TestEdgeServerTransitionStates(t *testing.T) {
 		t.Errorf("Expected an error when trying to shutdown wrong server")
 	}
 	if Current != Management {
-		t.Errorf("Server is not in management status after failed start operational server")
+		t.Errorf("Not in management status after failed start operational server")
 	}
 
+	time.Sleep(1 * time.Second)
 	if err := ShutdownManagementServer(); err != nil {
 		t.Errorf("Error stopping management server %v", err)
 	}
@@ -94,25 +86,21 @@ func TestEdgeServerTransitionStates(t *testing.T) {
 		t.Errorf("Server is not in None status")
 	}
 
-	WaitForState(Stopped)
-
 	// analog tests with operational server
-	if err := StartOperationalServer(); err != nil {
+	if err := StartOperationalServer(chUserEvs, &cfg); err != nil {
 		t.Errorf("Error starting operational server %v", err)
 	}
-	if Current != Operational || (State != Starting && State != Running) {
+	if Current != Operational || State != Running {
 		t.Errorf("Server is not in starting or in operational status")
 	}
 
-	WaitForState(Running)
-
 	// start management server without stopping operational must throw an error
 	if err := StartManagementServer; err == nil {
-		t.Errorf(`Expected an error when trying to launch one server instance having 
-		the other active`)
+		t.Errorf("Expected an error when trying to launch one server " +
+			"instance having the other active")
 	}
 	if Current != Operational {
-		t.Errorf("Server is not in operational status after failed start operational server")
+		t.Errorf("Not in operational status after failed start operational server")
 	}
 
 	// stop wrong server must throw an error
@@ -120,9 +108,10 @@ func TestEdgeServerTransitionStates(t *testing.T) {
 		t.Errorf("Expected an error when trying to shutdown wrong server")
 	}
 	if Current != Operational {
-		t.Errorf("Server is not in operational status after failed start operational server")
+		t.Errorf("Not in operational status after failed start operational server")
 	}
 
+	time.Sleep(1 * time.Second)
 	if err := ShutdownOperationalServer(); err != nil {
 		t.Errorf("Error stopping operational server %v", err)
 	}
diff --git a/server/router.go b/server/router.go
index 20a3716..3af467e 100644
--- a/server/router.go
+++ b/server/router.go
@@ -21,18 +21,31 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
+	"launchpad.net/wifi-connect/utils"
 )
 
 // managementHandler handles requests for web UI when AP is up
-func managementHandler() *mux.Router {
+func managementHandler(chUserEvs chan<- UserEvent, config *utils.Config,
+	ssidLs *utils.SsidList) *mux.Router {
+
 	router := mux.NewRouter()
+	ms := &ManagementServer{chUserEvs: chUserEvs, config: *config, ssidLs: ssidLs}
 
 	// Pages routes
-	router.Handle("/", Middleware(http.HandlerFunc(ManagementHandler))).Methods("GET")
-	router.Handle("/config", Middleware(http.HandlerFunc(SaveConfigHandler))).Methods("POST")
-	router.Handle("/connect", Middleware(http.HandlerFunc(ConnectHandler))).Methods("POST")
-	router.HandleFunc("/hashit", HashItHandler).Methods("POST")
-	router.Handle("/refresh", Middleware(http.HandlerFunc(RefreshHandler))).Methods("GET")
+	router.HandleFunc("/", ms.ManagementHandler).Methods("GET")
+	router.HandleFunc("/config", ms.SaveConfigHandler).Methods("POST")
+	router.HandleFunc("/connect", ms.ConnectHandler).Methods("POST")
+	router.HandleFunc("/hashit", ms.HashItHandler).Methods("POST")
+	router.HandleFunc("/refresh", ms.RefreshHandler).Methods("GET")
+	// To allow detection of captive portal
+	// Android/ChromeOS
+	router.HandleFunc("/generate_204", ms.RedirectHandler).Methods("GET")
+	// iOS/Mac
+	router.HandleFunc("/hotspot-detect.html", ms.RedirectHandler).Methods("GET")
+	router.HandleFunc("/library/test/success.html", ms.RedirectHandler).Methods("GET")
+	// Windows
+	router.HandleFunc("/connecttest.txt", ms.RedirectHandler).Methods("GET")
+	router.HandleFunc("/redirect", ms.RedirectHandler).Methods("GET")
 
 	// Resources path
 	fs := http.StripPrefix("/static/", http.FileServer(http.Dir(ResourcesPath)))
@@ -42,15 +55,17 @@ func managementHandler() *mux.Router {
 }
 
 // operationalHandler handles request for web UI when connected to external Wi-Fi
-func operationalHandler() *mux.Router {
+func operationalHandler(chUserEvs chan<- UserEvent) *mux.Router {
 	router := mux.NewRouter()
+	os := &OperationalServer{chUserEvs: chUserEvs}
 
-	router.HandleFunc("/", OperationalHandler).Methods("GET")
-	router.Handle("/disconnect", Middleware(http.HandlerFunc(DisconnectHandler))).Methods("GET")
-	router.HandleFunc("/hashit", HashItHandler).Methods("POST")
+	router.HandleFunc("/", os.OperationalHandler).Methods("GET")
+	router.HandleFunc("/disconnect", os.DisconnectHandler).Methods("GET")
+	router.HandleFunc("/hashit", os.HashItHandler).Methods("POST")
 
 	// Resources path
 	fs := http.StripPrefix("/static/", http.FileServer(http.Dir(ResourcesPath)))
 	router.PathPrefix("/static/").Handler(fs)
+
 	return router
 }
diff --git a/service/service.go b/service/service.go
index 3ea136c..3d30bc8 100644
--- a/service/service.go
+++ b/service/service.go
@@ -18,157 +18,21 @@
 package main
 
 import (
-	"fmt"
 	"log"
-	"os"
-	"time"
 
 	"launchpad.net/wifi-connect/daemon"
-	"launchpad.net/wifi-connect/netman"
 	"launchpad.net/wifi-connect/utils"
-	"launchpad.net/wifi-connect/wifiap"
 )
 
-var prevConnected bool
-
 func main() {
-
-	log.SetFlags(log.Lshortfile)
+	log.SetFlags(log.Ldate | log.Ltime | log.Lmicroseconds | log.Lshortfile)
 	log.SetPrefix("== wifi-connect: ")
 
-	c := netman.DefaultClient()
-	cw := wifiap.DefaultClient()
-	client := daemon.GetClient()
-
-	config, err := daemon.LoadPreConfig()
-	if err != nil {
-		log.Printf("Empty preconfiguration: %v", err)
-	}
-	err = client.SetDefaults(cw, config)
+	config, err := utils.LoadConfig()
 	if err != nil {
-		log.Printf("SetDetaults error: %v", err)
+		log.Printf("Empty configuration: %v", err)
 	}
-	first := true
-	client.SetWaitFlagPath(os.Getenv("SNAP_COMMON") + "/startingApConnect")
-	client.SetManualFlagPath(os.Getenv("SNAP_COMMON") + "/manualMode")
-
-	client.ManagementServerDown()
-	client.OperationalServerDown()
-
-	connected := false
-	prevConnected = false
-
-	for {
-		if first {
-			log.Print("daemon STARTING")
-			client.SetPreviousState(daemon.STARTING)
-			client.SetState(daemon.STARTING)
-			first = false
-			//clean start require wifi AP down so we can get SSIDs
-			cw.Disable()
-			//remove previous State flags
-			utils.RemoveFlagFile(client.GetWaitFlagPath())
-			utils.RemoveFlagFile(client.GetManualFlagPath())
-			//TODO only wait if wlan0 is managed
-			//wait time period (TBD) on first run to allow wifi connections
-			time.Sleep(10000 * time.Millisecond)
-		}
-
-		// wait 5 seconds on each iter
-		time.Sleep(5000 * time.Millisecond)
 
-		config, err = daemon.LoadPreConfig()
-		if err != nil {
-			log.Printf("Empty preconfiguration: %v", err)
-		}
-		// loop without action if in manual mode
-		if client.ManualMode() {
-			continue
-		}
-
-		// start clean on exiting manual mode
-		if client.GetPreviousState() == daemon.MANUAL {
-			first = true
-			continue
-		}
-		// the AP should not be up without SSIDS
-		if client.IsApUpWithoutSSIDs(cw) {
-			cw.Disable()
-			continue
-		}
-
-		// log connected state if different
-		prevConnected = connected
-		connected = c.ConnectedWifi(c.GetWifiDevices(c.GetDevices()))
-		if first || prevConnected != connected {
-			if connected {
-				log.Print("WIFI CONNECTED")
-			} else {
-				log.Print("WIFI NOT CONNECTED")
-			}
-		}
-
-		// if an external wifi connection, we are in Operational mode
-		// and we stay here until there is an external wifi connection
-		if connected {
-			//log.Print("operational config:", config.Operational)
-			client.SetState(daemon.OPERATING)
-			if client.GetPreviousState() != daemon.OPERATING {
-				log.Print("entering OPERATIONAL mode")
-				client.ManagementServerDown()
-				if config.Operational {
-					//log.Print("about to put up oper server")
-					client.OperationalServerUp()
-				}
-			}
-			continue
-		}
-
-		// wait/loop until wait flag file is gone
-		// this stops daemon State changing until the management portal
-		// is done, either stopped or the user has attempted to connect to
-		// an external AP
-		if client.CheckWaitApConnect() {
-			continue
-		}
-
-		client.SetState(daemon.MANAGING)
-		if client.GetPreviousState() != daemon.MANAGING || !client.CheckWaitApConnect() {
-			// if wlan0 managed, set Unmanaged so that we can bring up wifi-ap
-			// properly if needed
-			if err := c.Unmanage(); err != nil {
-				log.Print(err)
-				continue
-			}
-
-			//wifi-ap UP?
-			wifiUp, err := cw.Enabled()
-			if err != nil {
-				log.Printf("Error checking wifi-ap.Enabled(): %v", err)
-				continue // try again since no better course of action
-			}
-
-			if !wifiUp {
-				log.Print("entering MANAGEMENT mode")
-				found := c.ScanAndWriteSsidsToFile(utils.SsidsFile)
-				if err := c.Unmanage(); err != nil {
-					fmt.Println(err)
-					continue
-				}
-				if !found {
-					log.Print("No SSIDs found. Continuing to scan for SSIDS...")
-					continue
-				}
-				log.Printf("starting wifi-ap")
-				if err := cw.Enable(); err != nil {
-					log.Print(err)
-					continue
-				}
-				//if client.GetPreviousState() == daemon.OPERATING {
-				client.OperationalServerDown()
-				//}
-				client.ManagementServerUp()
-			}
-		}
-	}
+	service := daemon.GetService(config)
+	service.Start()
 }
diff --git a/service/service_test.go b/service/service_test.go
 new file mode 100644
index 0000000..795dc6a
--- /dev/null
+++ b/service/service_test.go
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2017 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package main
+
+import (
+	"testing"
+)
+
+func TestService(t *testing.T) {
+	// TODO Fill it
+}
diff --git a/snapcraft.yaml b/snapcraft.yaml
index a2af4b2..b7e3be7 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: wifi-connect 
-version: 0.11
+version: '0.2'
 summary: Connect your device to external wifi over temp wifi AP
 description: |
   A solution to enable your device to connect to an external
@@ -11,51 +11,73 @@ description: |
   https://code.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-connect
 grade: stable
 confinement: strict
+base: core18
 
 apps:
-  wifi-connect: 
-    command: cmd 
-    plugs: [network, network-bind, network-manager, control]
   daemon:
-    command: service 
+    command: wificonnectd
     daemon: simple
-    plugs: [network-manager, control, network-bind]
+    plugs: [network-manager, network-bind, firewall-control]
 
 hooks:
-   configure:
-     plugs: [network]
- 
-plugs:
-  control:
-    interface: content
-    content: socket-directory
-    target: $SNAP_COMMON
-    default-provider: wifi-ap
+  configure:
+    plugs: [network]
+
+# For dnsmasq, dir where leases are stored
+layout:
+  /var/lib/misc:
+    bind: $SNAP_DATA
 
 parts:
-  go:
-    plugin: go
-    source: . 
-    go-importpath: launchpad.net/wifi-connect
-    build-packages:
-      # needed by go get
-      - bzr
-    install: |
+
+  go-binaries:
+    plugin: dump
+    source: .
+    source-type: local
+    build-snaps: [ "go" ]
+    build-packages: [ "bzr", "git", "python", "build-essential" ]
+    stage-packages: [ "dnsmasq" ]
+    override-build: |
+      set -ex
+      export GOPATH=$(mktemp -d)
+      (
+      src_path="$GOPATH"/src/launchpad.net/wifi-connect
+      mkdir -p "$src_path"
+      cp -a avahi daemon hooks netman server service utils static \
+          dependencies.tsv mdlint.py README.md run-checks "$src_path"
+      cd "$src_path"
+      go get launchpad.net/godeps
+      export PATH=$PATH:$GOPATH/bin
+      godeps -u dependencies.tsv
+      mkdir -p "$SNAPCRAFT_PART_INSTALL"/bin/
+      cd "$GOPATH"/src/launchpad.net/wifi-connect/
+      go build -o "$SNAPCRAFT_PART_INSTALL"/bin/wificonnectd service/service.go
+      # configure hook
+      mkdir -p "$SNAPCRAFT_PART_INSTALL"/snap/hooks
+      go build -o "$SNAPCRAFT_PART_INSTALL"/snap/hooks/configure hooks/configure.go
+      )
       # set environment var SKIP_TESTS to 'y' or 'yes' if you want not to execute
       # this part unit tests in your next compilation.
+      SKIP_TESTS=no
       if [ "$SKIP_TESTS" = "yes" ] || [ "$SKIP_TESTS" = "y" ]; then
-        echo "skipping unit tests"
+          echo "skipping unit tests"
       else 
-        export GOPATH=$PWD/../go
-        cd $GOPATH/src/launchpad.net/wifi-connect
-        ./run-checks all
+          cd "$GOPATH"/src/launchpad.net/wifi-connect
+          ./run-checks all
       fi
-      # configure hook
-      mkdir -p $SNAPCRAFT_PART_INSTALL/snap/hooks
-      mv $SNAPCRAFT_PART_INSTALL/bin/hooks $SNAPCRAFT_PART_INSTALL/snap/hooks/configure
+      cd
+      rm -rf "$GOPATH"
+    stage:
+      - bin/wificonnectd
+      - snap/hooks/configure
+      - usr/sbin/dnsmasq
+
   assets:
     plugin: dump
     source: .
-    prepare: ../../../scriptlets/fill_country_codes.sh
+    override-build: |
+      "$SNAPCRAFT_PROJECT_DIR"/scriptlets/fill_country_codes.sh
+      snapcraftctl build
     stage:
       - static
+      - -static/tests
diff --git a/static/js/jquery.min.js b/static/js/jquery.min.js
 new file mode 100644
index 0000000..644d35e
--- /dev/null
+++ b/static/js/jquery.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v3.2.1 | (c) JS Foundation and other contributors | jquery.org/license */
+!function(a,b){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){"use strict";var c=[],d=a.document,e=Object.getPrototypeOf,f=c.slice,g=c.concat,h=c.push,i=c.indexOf,j={},k=j.toString,l=j.hasOwnProperty,m=l.toString,n=m.call(Object),o={};function p(a,b){b=b||d;var c=b.createElement("script");c.text=a,b.head.appendChild(c).parentNode.removeChild(c)}var q="3.2.1",r=function(a,b){return new r.fn.init(a,b)},s=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,t=/^-ms-/,u=/-([a-z])/g,v=function(a,b){return b.toUpperCase()};r.fn=r.prototype={jquery:q,constructor:r,length:0,toArray:function(){return f.call(this)},get:function(a){return null==a?f.call(this):a<0?this[a+this.length]:this[a]},pushStack:function(a){var b=r.merge(this.constructor(),a);return b.prevObject=this,b},each:function(a){return r.each(this,a)},map:function(a){return this.pushStack(r.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(f.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(a<0?b:0);return this.pushStack(c>=0&&c<b?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:h,sort:c.sort,splice:c.splice},r.extend=r.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||r.isFunction(g)||(g={}),h===i&&(g=this,h--);h<i;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(r.isPlainObject(d)||(e=Array.isArray(d)))?(e?(e=!1,f=c&&Array.isArray(c)?c:[]):f=c&&r.isPlainObject(c)?c:{},g[b]=r.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},r.extend({expando:"jQuery"+(q+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===r.type(a)},isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){var b=r.type(a);return("number"===b||"string"===b)&&!isNaN(a-parseFloat(a))},isPlainObject:function(a){var b,c;return!(!a||"[object Object]"!==k.call(a))&&(!(b=e(a))||(c=l.call(b,"constructor")&&b.constructor,"function"==typeof c&&m.call(c)===n))},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?j[k.call(a)]||"object":typeof a},globalEval:function(a){p(a)},camelCase:function(a){return a.replace(t,"ms-").replace(u,v)},each:function(a,b){var c,d=0;if(w(a)){for(c=a.length;d<c;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(s,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(w(Object(a))?r.merge(c,"string"==typeof a?[a]:a):h.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:i.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;d<c;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;f<g;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,f=0,h=[];if(w(a))for(d=a.length;f<d;f++)e=b(a[f],f,c),null!=e&&h.push(e);else for(f in a)e=b(a[f],f,c),null!=e&&h.push(e);return g.apply([],h)},guid:1,proxy:function(a,b){var c,d,e;if("string"==typeof b&&(c=a[b],b=a,a=c),r.isFunction(a))return d=f.call(arguments,2),e=function(){return a.apply(b||this,d.concat(f.call(arguments)))},e.guid=a.guid=a.guid||r.guid++,e},now:Date.now,support:o}),"function"==typeof Symbol&&(r.fn[Symbol.iterator]=c[Symbol.iterator]),r.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){j["[object "+b+"]"]=b.toLowerCase()});function w(a){var b=!!a&&"length"in a&&a.length,c=r.type(a);return"function"!==c&&!r.isWindow(a)&&("array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a)}var x=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=function(a,b){for(var c=0,d=a.length;c<d;c++)if(a[c]===b)return c;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",M="\\["+K+"*("+L+")(?:"+K+"*([*^$|!~]?=)"+K+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+L+"))|)"+K+"*\\]",N=":("+L+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+M+")*)|.*)\\)|)",O=new RegExp(K+"+","g"),P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(N),U=new RegExp("^"+L+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+N),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),aa=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:d<0?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ba=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ca=function(a,b){return b?"\0"===a?"\ufffd":a.slice(0,-1)+"\\"+a.charCodeAt(a.length-1).toString(16)+" ":"\\"+a},da=function(){m()},ea=ta(function(a){return a.disabled===!0&&("form"in a||"label"in a)},{dir:"parentNode",next:"legend"});try{G.apply(D=H.call(v.childNodes),v.childNodes),D[v.childNodes.length].nodeType}catch(fa){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s=b&&b.ownerDocument,w=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==w&&9!==w&&11!==w)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==w&&(l=Z.exec(a)))if(f=l[1]){if(9===w){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(s&&(j=s.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(l[2])return G.apply(d,b.getElementsByTagName(a)),d;if((f=l[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==w)s=b,r=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(ba,ca):b.setAttribute("id",k=u),o=g(a),h=o.length;while(h--)o[h]="#"+k+" "+sa(o[h]);r=o.join(","),s=$.test(a)&&qa(b.parentNode)||b}if(r)try{return G.apply(d,s.querySelectorAll(r)),d}catch(x){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(P,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("fieldset");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&a.sourceIndex-b.sourceIndex;if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return function(b){return"form"in b?b.parentNode&&b.disabled===!1?"label"in b?"label"in b.parentNode?b.parentNode.disabled===a:b.disabled===a:b.isDisabled===a||b.isDisabled!==!a&&ea(b)===a:b.disabled===a:"label"in b&&b.disabled===a}}function pa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function qa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return!!b&&"HTML"!==b.nodeName},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),v!==n&&(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(n.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){return a.getAttribute("id")===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}}):(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c,d,e,f=b.getElementById(a);if(f){if(c=f.getAttributeNode("id"),c&&c.value===a)return[f];e=b.getElementsByName(a),d=0;while(f=e[d++])if(c=f.getAttributeNode("id"),c&&c.value===a)return[f]}return[]}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){if("undefined"!=typeof b.getElementsByClassName&&p)return b.getElementsByClassName(a)},r=[],q=[],(c.qsa=Y.test(n.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){a.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+K+"*[*^$|!~]?="),2!==a.querySelectorAll(":enabled").length&&q.push(":enabled",":disabled"),o.appendChild(a).disabled=!0,2!==a.querySelectorAll(":disabled").length&&q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Y.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"*"),s.call(a,"[s!='']:x"),r.push("!=",N)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Y.test(o.compareDocumentPosition),t=b||Y.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?I(k,a)-I(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?I(k,a)-I(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?la(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(S,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.escape=function(a){return(a+"").replace(ba,ca)},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(_,aa),a[3]=(a[3]||a[4]||a[5]||"").replace(_,aa),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return V.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&T.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(_,aa).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:!b||(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(O," ")+" ").indexOf(c)>-1:"|="===b&&(e===c||e.slice(0,c.length+1)===c+"-"))}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(P,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(_,aa),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return U.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(_,aa).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:oa(!1),disabled:oa(!0),checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:pa(function(){return[0]}),last:pa(function(a,b){return[b-1]}),eq:pa(function(a,b,c){return[c<0?c+b:c]}),even:pa(function(a,b){for(var c=0;c<b;c+=2)a.push(c);return a}),odd:pa(function(a,b){for(var c=1;c<b;c+=2)a.push(c);return a}),lt:pa(function(a,b,c){for(var d=c<0?c+b:c;--d>=0;)a.push(d);return a}),gt:pa(function(a,b,c){for(var d=c<0?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function ra(){}ra.prototype=d.filters=d.pseudos,d.setFilters=new ra,g=ga.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){c&&!(e=Q.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?ga.error(a):z(a,i).slice(0)};function sa(a){for(var b=0,c=a.length,d="";b<c;b++)d+=a[b].value;return d}function ta(a,b,c){var d=b.dir,e=b.next,f=e||d,g=c&&"parentNode"===f,h=x++;return b.first?function(b,c,e){while(b=b[d])if(1===b.nodeType||g)return a(b,c,e);return!1}:function(b,c,i){var j,k,l,m=[w,h];if(i){while(b=b[d])if((1===b.nodeType||g)&&a(b,c,i))return!0}else while(b=b[d])if(1===b.nodeType||g)if(l=b[u]||(b[u]={}),k=l[b.uniqueID]||(l[b.uniqueID]={}),e&&e===b.nodeName.toLowerCase())b=b[d]||b;else{if((j=k[f])&&j[0]===w&&j[1]===h)return m[2]=j[2];if(k[f]=m,m[2]=a(b,c,i))return!0}return!1}}function ua(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function va(a,b,c){for(var d=0,e=b.length;d<e;d++)ga(a,b[d],c);return c}function wa(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;h<i;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function xa(a,b,c,d,e,f){return d&&!d[u]&&(d=xa(d)),e&&!e[u]&&(e=xa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||va(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:wa(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=wa(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=wa(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ya(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ta(function(a){return a===b},h,!0),l=ta(function(a){return I(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];i<f;i++)if(c=d.relative[a[i].type])m=[ta(ua(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;e<f;e++)if(d.relative[a[e].type])break;return xa(i>1&&ua(m),i>1&&sa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(P,"$1"),c,i<e&&ya(a.slice(i,e)),e<f&&ya(a=a.slice(e)),e<f&&sa(a))}m.push(c)}return ua(m)}function za(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=E.call(i));u=wa(u)}G.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&ga.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=ya(b[c]),f[u]?d.push(f):e.push(f);f=A(a,za(e,d)),f.selector=a}return f},i=ga.select=function(a,b,c,e){var f,i,j,k,l,m="function"==typeof a&&a,n=!e&&g(a=m.selector||a);if(c=c||[],1===n.length){if(i=n[0]=n[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&9===b.nodeType&&p&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(_,aa),b)||[])[0],!b)return c;m&&(b=b.parentNode),a=a.slice(i.shift().value.length)}f=V.needsContext.test(a)?0:i.length;while(f--){if(j=i[f],d.relative[k=j.type])break;if((l=d.find[k])&&(e=l(j.matches[0].replace(_,aa),$.test(i[0].type)&&qa(b.parentNode)||b))){if(i.splice(f,1),a=e.length&&sa(i),!a)return G.apply(c,e),c;break}}}return(m||h(a,n))(e,b,!p,c,!b||$.test(a)&&qa(b.parentNode)||b),c},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("fieldset"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){if(!c)return a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){if(!c&&"input"===a.nodeName.toLowerCase())return a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(J,function(a,b,c){var d;if(!c)return a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);r.find=x,r.expr=x.selectors,r.expr[":"]=r.expr.pseudos,r.uniqueSort=r.unique=x.uniqueSort,r.text=x.getText,r.isXMLDoc=x.isXML,r.contains=x.contains,r.escapeSelector=x.escape;var y=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&r(a).is(c))break;d.push(a)}return d},z=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},A=r.expr.match.needsContext;function B(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()}var C=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i,D=/^.[^:#\[\.,]*$/;function E(a,b,c){return r.isFunction(b)?r.grep(a,function(a,d){return!!b.call(a,d,a)!==c}):b.nodeType?r.grep(a,function(a){return a===b!==c}):"string"!=typeof b?r.grep(a,function(a){return i.call(b,a)>-1!==c}):D.test(b)?r.filter(b,a,c):(b=r.filter(b,a),r.grep(a,function(a){return i.call(b,a)>-1!==c&&1===a.nodeType}))}r.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?r.find.matchesSelector(d,a)?[d]:[]:r.find.matches(a,r.grep(b,function(a){return 1===a.nodeType}))},r.fn.extend({find:function(a){var b,c,d=this.length,e=this;if("string"!=typeof a)return this.pushStack(r(a).filter(function(){for(b=0;b<d;b++)if(r.contains(e[b],this))return!0}));for(c=this.pushStack([]),b=0;b<d;b++)r.find(a,e[b],c);return d>1?r.uniqueSort(c):c},filter:function(a){return this.pushStack(E(this,a||[],!1))},not:function(a){return this.pushStack(E(this,a||[],!0))},is:function(a){return!!E(this,"string"==typeof a&&A.test(a)?r(a):a||[],!1).length}});var F,G=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,H=r.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||F,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:G.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof r?b[0]:b,r.merge(this,r.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),C.test(e[1])&&r.isPlainObject(b))for(e in b)r.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&(this[0]=f,this.length=1),this}return a.nodeType?(this[0]=a,this.length=1,this):r.isFunction(a)?void 0!==c.ready?c.ready(a):a(r):r.makeArray(a,this)};H.prototype=r.fn,F=r(d);var I=/^(?:parents|prev(?:Until|All))/,J={children:!0,contents:!0,next:!0,prev:!0};r.fn.extend({has:function(a){var b=r(a,this),c=b.length;return this.filter(function(){for(var a=0;a<c;a++)if(r.contains(this,b[a]))return!0})},closest:function(a,b){var c,d=0,e=this.length,f=[],g="string"!=typeof a&&r(a);if(!A.test(a))for(;d<e;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&r.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?r.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?i.call(r(a),this[0]):i.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(r.uniqueSort(r.merge(this.get(),r(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function K(a,b){while((a=a[b])&&1!==a.nodeType);return a}r.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return y(a,"parentNode")},parentsUntil:function(a,b,c){return y(a,"parentNode",c)},next:function(a){return K(a,"nextSibling")},prev:function(a){return K(a,"previousSibling")},nextAll:function(a){return y(a,"nextSibling")},prevAll:function(a){return y(a,"previousSibling")},nextUntil:function(a,b,c){return y(a,"nextSibling",c)},prevUntil:function(a,b,c){return y(a,"previousSibling",c)},siblings:function(a){return z((a.parentNode||{}).firstChild,a)},children:function(a){return z(a.firstChild)},contents:function(a){return B(a,"iframe")?a.contentDocument:(B(a,"template")&&(a=a.content||a),r.merge([],a.childNodes))}},function(a,b){r.fn[a]=function(c,d){var e=r.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=r.filter(d,e)),this.length>1&&(J[a]||r.uniqueSort(e),I.test(a)&&e.reverse()),this.pushStack(e)}});var L=/[^\x20\t\r\n\f]+/g;function M(a){var b={};return r.each(a.match(L)||[],function(a,c){b[c]=!0}),b}r.Callbacks=function(a){a="string"==typeof a?M(a):r.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=e||a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){r.each(b,function(b,c){r.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==r.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return r.each(arguments,function(a,b){var c;while((c=r.inArray(b,f,c))>-1)f.splice(c,1),c<=h&&h--}),this},has:function(a){return a?r.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||b||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j};function N(a){return a}function O(a){throw a}function P(a,b,c,d){var e;try{a&&r.isFunction(e=a.promise)?e.call(a).done(b).fail(c):a&&r.isFunction(e=a.then)?e.call(a,b,c):b.apply(void 0,[a].slice(d))}catch(a){c.apply(void 0,[a])}}r.extend({Deferred:function(b){var c=[["notify","progress",r.Callbacks("memory"),r.Callbacks("memory"),2],["resolve","done",r.Callbacks("once memory"),r.Callbacks("once memory"),0,"resolved"],["reject","fail",r.Callbacks("once memory"),r.Callbacks("once memory"),1,"rejected"]],d="pending",e={state:function(){return d},always:function(){return f.done(arguments).fail(arguments),this},"catch":function(a){return e.then(null,a)},pipe:function(){var a=arguments;return r.Deferred(function(b){r.each(c,function(c,d){var e=r.isFunction(a[d[4]])&&a[d[4]];f[d[1]](function(){var a=e&&e.apply(this,arguments);a&&r.isFunction(a.promise)?a.promise().progress(b.notify).done(b.resolve).fail(b.reject):b[d[0]+"With"](this,e?[a]:arguments)})}),a=null}).promise()},then:function(b,d,e){var f=0;function g(b,c,d,e){return function(){var h=this,i=arguments,j=function(){var a,j;if(!(b<f)){if(a=d.apply(h,i),a===c.promise())throw new TypeError("Thenable self-resolution");j=a&&("object"==typeof a||"function"==typeof a)&&a.then,r.isFunction(j)?e?j.call(a,g(f,c,N,e),g(f,c,O,e)):(f++,j.call(a,g(f,c,N,e),g(f,c,O,e),g(f,c,N,c.notifyWith))):(d!==N&&(h=void 0,i=[a]),(e||c.resolveWith)(h,i))}},k=e?j:function(){try{j()}catch(a){r.Deferred.exceptionHook&&r.Deferred.exceptionHook(a,k.stackTrace),b+1>=f&&(d!==O&&(h=void 0,i=[a]),c.rejectWith(h,i))}};b?k():(r.Deferred.getStackHook&&(k.stackTrace=r.Deferred.getStackHook()),a.setTimeout(k))}}return r.Deferred(function(a){c[0][3].add(g(0,a,r.isFunction(e)?e:N,a.notifyWith)),c[1][3].add(g(0,a,r.isFunction(b)?b:N)),c[2][3].add(g(0,a,r.isFunction(d)?d:O))}).promise()},promise:function(a){return null!=a?r.extend(a,e):e}},f={};return r.each(c,function(a,b){var g=b[2],h=b[5];e[b[1]]=g.add,h&&g.add(function(){d=h},c[3-a][2].disable,c[0][2].lock),g.add(b[3].fire),f[b[0]]=function(){return f[b[0]+"With"](this===f?void 0:this,arguments),this},f[b[0]+"With"]=g.fireWith}),e.promise(f),b&&b.call(f,f),f},when:function(a){var b=arguments.length,c=b,d=Array(c),e=f.call(arguments),g=r.Deferred(),h=function(a){return function(c){d[a]=this,e[a]=arguments.length>1?f.call(arguments):c,--b||g.resolveWith(d,e)}};if(b<=1&&(P(a,g.done(h(c)).resolve,g.reject,!b),"pending"===g.state()||r.isFunction(e[c]&&e[c].then)))return g.then();while(c--)P(e[c],h(c),g.reject);return g.promise()}});var Q=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;r.Deferred.exceptionHook=function(b,c){a.console&&a.console.warn&&b&&Q.test(b.name)&&a.console.warn("jQuery.Deferred exception: "+b.message,b.stack,c)},r.readyException=function(b){a.setTimeout(function(){throw b})};var R=r.Deferred();r.fn.ready=function(a){return R.then(a)["catch"](function(a){r.readyException(a)}),this},r.extend({isReady:!1,readyWait:1,ready:function(a){(a===!0?--r.readyWait:r.isReady)||(r.isReady=!0,a!==!0&&--r.readyWait>0||R.resolveWith(d,[r]))}}),r.ready.then=R.then;function S(){d.removeEventListener("DOMContentLoaded",S),
+a.removeEventListener("load",S),r.ready()}"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(r.ready):(d.addEventListener("DOMContentLoaded",S),a.addEventListener("load",S));var T=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===r.type(c)){e=!0;for(h in c)T(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,r.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(r(a),c)})),b))for(;h<i;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},U=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function V(){this.expando=r.expando+V.uid++}V.uid=1,V.prototype={cache:function(a){var b=a[this.expando];return b||(b={},U(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[r.camelCase(b)]=c;else for(d in b)e[r.camelCase(d)]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][r.camelCase(b)]},access:function(a,b,c){return void 0===b||b&&"string"==typeof b&&void 0===c?this.get(a,b):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d=a[this.expando];if(void 0!==d){if(void 0!==b){Array.isArray(b)?b=b.map(r.camelCase):(b=r.camelCase(b),b=b in d?[b]:b.match(L)||[]),c=b.length;while(c--)delete d[b[c]]}(void 0===b||r.isEmptyObject(d))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!r.isEmptyObject(b)}};var W=new V,X=new V,Y=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Z=/[A-Z]/g;function $(a){return"true"===a||"false"!==a&&("null"===a?null:a===+a+""?+a:Y.test(a)?JSON.parse(a):a)}function _(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Z,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c=$(c)}catch(e){}X.set(a,b,c)}else c=void 0;return c}r.extend({hasData:function(a){return X.hasData(a)||W.hasData(a)},data:function(a,b,c){return X.access(a,b,c)},removeData:function(a,b){X.remove(a,b)},_data:function(a,b,c){return W.access(a,b,c)},_removeData:function(a,b){W.remove(a,b)}}),r.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=X.get(f),1===f.nodeType&&!W.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=r.camelCase(d.slice(5)),_(f,d,e[d])));W.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){X.set(this,a)}):T(this,function(b){var c;if(f&&void 0===b){if(c=X.get(f,a),void 0!==c)return c;if(c=_(f,a),void 0!==c)return c}else this.each(function(){X.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){X.remove(this,a)})}}),r.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=W.get(a,b),c&&(!d||Array.isArray(c)?d=W.access(a,b,r.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=r.queue(a,b),d=c.length,e=c.shift(),f=r._queueHooks(a,b),g=function(){r.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return W.get(a,c)||W.access(a,c,{empty:r.Callbacks("once memory").add(function(){W.remove(a,[b+"queue",c])})})}}),r.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?r.queue(this[0],a):void 0===b?this:this.each(function(){var c=r.queue(this,a,b);r._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&r.dequeue(this,a)})},dequeue:function(a){return this.each(function(){r.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=r.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=W.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var aa=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ba=new RegExp("^(?:([+-])=|)("+aa+")([a-z%]*)$","i"),ca=["Top","Right","Bottom","Left"],da=function(a,b){return a=b||a,"none"===a.style.display||""===a.style.display&&r.contains(a.ownerDocument,a)&&"none"===r.css(a,"display")},ea=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};function fa(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return r.css(a,b,"")},i=h(),j=c&&c[3]||(r.cssNumber[b]?"":"px"),k=(r.cssNumber[b]||"px"!==j&&+i)&&ba.exec(r.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,r.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var ga={};function ha(a){var b,c=a.ownerDocument,d=a.nodeName,e=ga[d];return e?e:(b=c.body.appendChild(c.createElement(d)),e=r.css(b,"display"),b.parentNode.removeChild(b),"none"===e&&(e="block"),ga[d]=e,e)}function ia(a,b){for(var c,d,e=[],f=0,g=a.length;f<g;f++)d=a[f],d.style&&(c=d.style.display,b?("none"===c&&(e[f]=W.get(d,"display")||null,e[f]||(d.style.display="")),""===d.style.display&&da(d)&&(e[f]=ha(d))):"none"!==c&&(e[f]="none",W.set(d,"display",c)));for(f=0;f<g;f++)null!=e[f]&&(a[f].style.display=e[f]);return a}r.fn.extend({show:function(){return ia(this,!0)},hide:function(){return ia(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){da(this)?r(this).show():r(this).hide()})}});var ja=/^(?:checkbox|radio)$/i,ka=/<([a-z][^\/\0>\x20\t\r\n\f]+)/i,la=/^$|\/(?:java|ecma)script/i,ma={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ma.optgroup=ma.option,ma.tbody=ma.tfoot=ma.colgroup=ma.caption=ma.thead,ma.th=ma.td;function na(a,b){var c;return c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[],void 0===b||b&&B(a,b)?r.merge([a],c):c}function oa(a,b){for(var c=0,d=a.length;c<d;c++)W.set(a[c],"globalEval",!b||W.get(b[c],"globalEval"))}var pa=/<|&#?\w+;/;function qa(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],n=0,o=a.length;n<o;n++)if(f=a[n],f||0===f)if("object"===r.type(f))r.merge(m,f.nodeType?[f]:f);else if(pa.test(f)){g=g||l.appendChild(b.createElement("div")),h=(ka.exec(f)||["",""])[1].toLowerCase(),i=ma[h]||ma._default,g.innerHTML=i[1]+r.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;r.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",n=0;while(f=m[n++])if(d&&r.inArray(f,d)>-1)e&&e.push(f);else if(j=r.contains(f.ownerDocument,f),g=na(l.appendChild(f),"script"),j&&oa(g),c){k=0;while(f=g[k++])la.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),o.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",o.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var ra=d.documentElement,sa=/^key/,ta=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,ua=/^([^.]*)(?:\.(.+)|)/;function va(){return!0}function wa(){return!1}function xa(){try{return d.activeElement}catch(a){}}function ya(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)ya(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=wa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return r().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=r.guid++)),a.each(function(){r.event.add(this,b,e,d,c)})}r.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=W.get(a);if(q){c.handler&&(f=c,c=f.handler,e=f.selector),e&&r.find.matchesSelector(ra,e),c.guid||(c.guid=r.guid++),(i=q.events)||(i=q.events={}),(g=q.handle)||(g=q.handle=function(b){return"undefined"!=typeof r&&r.event.triggered!==b.type?r.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(L)||[""],j=b.length;while(j--)h=ua.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n&&(l=r.event.special[n]||{},n=(e?l.delegateType:l.bindType)||n,l=r.event.special[n]||{},k=r.extend({type:n,origType:p,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&r.expr.match.needsContext.test(e),namespace:o.join(".")},f),(m=i[n])||(m=i[n]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,o,g)!==!1||a.addEventListener&&a.addEventListener(n,g)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),r.event.global[n]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=W.hasData(a)&&W.get(a);if(q&&(i=q.events)){b=(b||"").match(L)||[""],j=b.length;while(j--)if(h=ua.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n){l=r.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=i[n]||[],h=h[2]&&new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&p!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,o,q.handle)!==!1||r.removeEvent(a,n,q.handle),delete i[n])}else for(n in i)r.event.remove(a,n+b[j],c,d,!0);r.isEmptyObject(i)&&W.remove(a,"handle events")}},dispatch:function(a){var b=r.event.fix(a),c,d,e,f,g,h,i=new Array(arguments.length),j=(W.get(this,"events")||{})[b.type]||[],k=r.event.special[b.type]||{};for(i[0]=b,c=1;c<arguments.length;c++)i[c]=arguments[c];if(b.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,b)!==!1){h=r.event.handlers.call(this,b,j),c=0;while((f=h[c++])&&!b.isPropagationStopped()){b.currentTarget=f.elem,d=0;while((g=f.handlers[d++])&&!b.isImmediatePropagationStopped())b.rnamespace&&!b.rnamespace.test(g.namespace)||(b.handleObj=g,b.data=g.data,e=((r.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(b.result=e)===!1&&(b.preventDefault(),b.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,b),b.result}},handlers:function(a,b){var c,d,e,f,g,h=[],i=b.delegateCount,j=a.target;if(i&&j.nodeType&&!("click"===a.type&&a.button>=1))for(;j!==this;j=j.parentNode||this)if(1===j.nodeType&&("click"!==a.type||j.disabled!==!0)){for(f=[],g={},c=0;c<i;c++)d=b[c],e=d.selector+" ",void 0===g[e]&&(g[e]=d.needsContext?r(e,this).index(j)>-1:r.find(e,this,null,[j]).length),g[e]&&f.push(d);f.length&&h.push({elem:j,handlers:f})}return j=this,i<b.length&&h.push({elem:j,handlers:b.slice(i)}),h},addProp:function(a,b){Object.defineProperty(r.Event.prototype,a,{enumerable:!0,configurable:!0,get:r.isFunction(b)?function(){if(this.originalEvent)return b(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[a]},set:function(b){Object.defineProperty(this,a,{enumerable:!0,configurable:!0,writable:!0,value:b})}})},fix:function(a){return a[r.expando]?a:new r.Event(a)},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==xa()&&this.focus)return this.focus(),!1},delegateType:"focusin"},blur:{trigger:function(){if(this===xa()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if("checkbox"===this.type&&this.click&&B(this,"input"))return this.click(),!1},_default:function(a){return B(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}}},r.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},r.Event=function(a,b){return this instanceof r.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?va:wa,this.target=a.target&&3===a.target.nodeType?a.target.parentNode:a.target,this.currentTarget=a.currentTarget,this.relatedTarget=a.relatedTarget):this.type=a,b&&r.extend(this,b),this.timeStamp=a&&a.timeStamp||r.now(),void(this[r.expando]=!0)):new r.Event(a,b)},r.Event.prototype={constructor:r.Event,isDefaultPrevented:wa,isPropagationStopped:wa,isImmediatePropagationStopped:wa,isSimulated:!1,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=va,a&&!this.isSimulated&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=va,a&&!this.isSimulated&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=va,a&&!this.isSimulated&&a.stopImmediatePropagation(),this.stopPropagation()}},r.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(a){var b=a.button;return null==a.which&&sa.test(a.type)?null!=a.charCode?a.charCode:a.keyCode:!a.which&&void 0!==b&&ta.test(a.type)?1&b?1:2&b?3:4&b?2:0:a.which}},r.event.addProp),r.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){r.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return e&&(e===d||r.contains(d,e))||(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),r.fn.extend({on:function(a,b,c,d){return ya(this,a,b,c,d)},one:function(a,b,c,d){return ya(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,r(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return b!==!1&&"function"!=typeof b||(c=b,b=void 0),c===!1&&(c=wa),this.each(function(){r.event.remove(this,a,c,b)})}});var za=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,Aa=/<script|<style|<link/i,Ba=/checked\s*(?:[^=]|=\s*.checked.)/i,Ca=/^true\/(.*)/,Da=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Ea(a,b){return B(a,"table")&&B(11!==b.nodeType?b:b.firstChild,"tr")?r(">tbody",a)[0]||a:a}function Fa(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function Ga(a){var b=Ca.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ha(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(W.hasData(a)&&(f=W.access(a),g=W.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;c<d;c++)r.event.add(b,e,j[e][c])}X.hasData(a)&&(h=X.access(a),i=r.extend({},h),X.set(b,i))}}function Ia(a,b){var c=b.nodeName.toLowerCase();"input"===c&&ja.test(a.type)?b.checked=a.checked:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}function Ja(a,b,c,d){b=g.apply([],b);var e,f,h,i,j,k,l=0,m=a.length,n=m-1,q=b[0],s=r.isFunction(q);if(s||m>1&&"string"==typeof q&&!o.checkClone&&Ba.test(q))return a.each(function(e){var f=a.eq(e);s&&(b[0]=q.call(this,e,f.html())),Ja(f,b,c,d)});if(m&&(e=qa(b,a[0].ownerDocument,!1,a,d),f=e.firstChild,1===e.childNodes.length&&(e=f),f||d)){for(h=r.map(na(e,"script"),Fa),i=h.length;l<m;l++)j=e,l!==n&&(j=r.clone(j,!0,!0),i&&r.merge(h,na(j,"script"))),c.call(a[l],j,l);if(i)for(k=h[h.length-1].ownerDocument,r.map(h,Ga),l=0;l<i;l++)j=h[l],la.test(j.type||"")&&!W.access(j,"globalEval")&&r.contains(k,j)&&(j.src?r._evalUrl&&r._evalUrl(j.src):p(j.textContent.replace(Da,""),k))}return a}function Ka(a,b,c){for(var d,e=b?r.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||r.cleanData(na(d)),d.parentNode&&(c&&r.contains(d.ownerDocument,d)&&oa(na(d,"script")),d.parentNode.removeChild(d));return a}r.extend({htmlPrefilter:function(a){return a.replace(za,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=r.contains(a.ownerDocument,a);if(!(o.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||r.isXMLDoc(a)))for(g=na(h),f=na(a),d=0,e=f.length;d<e;d++)Ia(f[d],g[d]);if(b)if(c)for(f=f||na(a),g=g||na(h),d=0,e=f.length;d<e;d++)Ha(f[d],g[d]);else Ha(a,h);return g=na(h,"script"),g.length>0&&oa(g,!i&&na(a,"script")),h},cleanData:function(a){for(var b,c,d,e=r.event.special,f=0;void 0!==(c=a[f]);f++)if(U(c)){if(b=c[W.expando]){if(b.events)for(d in b.events)e[d]?r.event.remove(c,d):r.removeEvent(c,d,b.handle);c[W.expando]=void 0}c[X.expando]&&(c[X.expando]=void 0)}}}),r.fn.extend({detach:function(a){return Ka(this,a,!0)},remove:function(a){return Ka(this,a)},text:function(a){return T(this,function(a){return void 0===a?r.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=a)})},null,a,arguments.length)},append:function(){return Ja(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ea(this,a);b.appendChild(a)}})},prepend:function(){return Ja(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ea(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ja(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ja(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(r.cleanData(na(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null!=a&&a,b=null==b?a:b,this.map(function(){return r.clone(this,a,b)})},html:function(a){return T(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!Aa.test(a)&&!ma[(ka.exec(a)||["",""])[1].toLowerCase()]){a=r.htmlPrefilter(a);try{for(;c<d;c++)b=this[c]||{},1===b.nodeType&&(r.cleanData(na(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ja(this,arguments,function(b){var c=this.parentNode;r.inArray(this,a)<0&&(r.cleanData(na(this)),c&&c.replaceChild(b,this))},a)}}),r.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){r.fn[a]=function(a){for(var c,d=[],e=r(a),f=e.length-1,g=0;g<=f;g++)c=g===f?this:this.clone(!0),r(e[g])[b](c),h.apply(d,c.get());return this.pushStack(d)}});var La=/^margin/,Ma=new RegExp("^("+aa+")(?!px)[a-z%]+$","i"),Na=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)};!function(){function b(){if(i){i.style.cssText="box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",i.innerHTML="",ra.appendChild(h);var b=a.getComputedStyle(i);c="1%"!==b.top,g="2px"===b.marginLeft,e="4px"===b.width,i.style.marginRight="50%",f="4px"===b.marginRight,ra.removeChild(h),i=null}}var c,e,f,g,h=d.createElement("div"),i=d.createElement("div");i.style&&(i.style.backgroundClip="content-box",i.cloneNode(!0).style.backgroundClip="",o.clearCloneStyle="content-box"===i.style.backgroundClip,h.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",h.appendChild(i),r.extend(o,{pixelPosition:function(){return b(),c},boxSizingReliable:function(){return b(),e},pixelMarginRight:function(){return b(),f},reliableMarginLeft:function(){return b(),g}}))}();function Oa(a,b,c){var d,e,f,g,h=a.style;return c=c||Na(a),c&&(g=c.getPropertyValue(b)||c[b],""!==g||r.contains(a.ownerDocument,a)||(g=r.style(a,b)),!o.pixelMarginRight()&&Ma.test(g)&&La.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function Pa(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Qa=/^(none|table(?!-c[ea]).+)/,Ra=/^--/,Sa={position:"absolute",visibility:"hidden",display:"block"},Ta={letterSpacing:"0",fontWeight:"400"},Ua=["Webkit","Moz","ms"],Va=d.createElement("div").style;function Wa(a){if(a in Va)return a;var b=a[0].toUpperCase()+a.slice(1),c=Ua.length;while(c--)if(a=Ua[c]+b,a in Va)return a}function Xa(a){var b=r.cssProps[a];return b||(b=r.cssProps[a]=Wa(a)||a),b}function Ya(a,b,c){var d=ba.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Za(a,b,c,d,e){var f,g=0;for(f=c===(d?"border":"content")?4:"width"===b?1:0;f<4;f+=2)"margin"===c&&(g+=r.css(a,c+ca[f],!0,e)),d?("content"===c&&(g-=r.css(a,"padding"+ca[f],!0,e)),"margin"!==c&&(g-=r.css(a,"border"+ca[f]+"Width",!0,e))):(g+=r.css(a,"padding"+ca[f],!0,e),"padding"!==c&&(g+=r.css(a,"border"+ca[f]+"Width",!0,e)));return g}function $a(a,b,c){var d,e=Na(a),f=Oa(a,b,e),g="border-box"===r.css(a,"boxSizing",!1,e);return Ma.test(f)?f:(d=g&&(o.boxSizingReliable()||f===a.style[b]),"auto"===f&&(f=a["offset"+b[0].toUpperCase()+b.slice(1)]),f=parseFloat(f)||0,f+Za(a,b,c||(g?"border":"content"),d,e)+"px")}r.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Oa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=r.camelCase(b),i=Ra.test(b),j=a.style;return i||(b=Xa(h)),g=r.cssHooks[b]||r.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:j[b]:(f=typeof c,"string"===f&&(e=ba.exec(c))&&e[1]&&(c=fa(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(r.cssNumber[h]?"":"px")),o.clearCloneStyle||""!==c||0!==b.indexOf("background")||(j[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i?j.setProperty(b,c):j[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=r.camelCase(b),i=Ra.test(b);return i||(b=Xa(h)),g=r.cssHooks[b]||r.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Oa(a,b,d)),"normal"===e&&b in Ta&&(e=Ta[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),r.each(["height","width"],function(a,b){r.cssHooks[b]={get:function(a,c,d){if(c)return!Qa.test(r.css(a,"display"))||a.getClientRects().length&&a.getBoundingClientRect().width?$a(a,b,d):ea(a,Sa,function(){return $a(a,b,d)})},set:function(a,c,d){var e,f=d&&Na(a),g=d&&Za(a,b,d,"border-box"===r.css(a,"boxSizing",!1,f),f);return g&&(e=ba.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=r.css(a,b)),Ya(a,c,g)}}}),r.cssHooks.marginLeft=Pa(o.reliableMarginLeft,function(a,b){if(b)return(parseFloat(Oa(a,"marginLeft"))||a.getBoundingClientRect().left-ea(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px"}),r.each({margin:"",padding:"",border:"Width"},function(a,b){r.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];d<4;d++)e[a+ca[d]+b]=f[d]||f[d-2]||f[0];return e}},La.test(a)||(r.cssHooks[a+b].set=Ya)}),r.fn.extend({css:function(a,b){return T(this,function(a,b,c){var d,e,f={},g=0;if(Array.isArray(b)){for(d=Na(a),e=b.length;g<e;g++)f[b[g]]=r.css(a,b[g],!1,d);return f}return void 0!==c?r.style(a,b,c):r.css(a,b)},a,b,arguments.length>1)}});function _a(a,b,c,d,e){return new _a.prototype.init(a,b,c,d,e)}r.Tween=_a,_a.prototype={constructor:_a,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||r.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(r.cssNumber[c]?"":"px")},cur:function(){var a=_a.propHooks[this.prop];return a&&a.get?a.get(this):_a.propHooks._default.get(this)},run:function(a){var b,c=_a.propHooks[this.prop];return this.options.duration?this.pos=b=r.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):_a.propHooks._default.set(this),this}},_a.prototype.init.prototype=_a.prototype,_a.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=r.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){r.fx.step[a.prop]?r.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[r.cssProps[a.prop]]&&!r.cssHooks[a.prop]?a.elem[a.prop]=a.now:r.style(a.elem,a.prop,a.now+a.unit)}}},_a.propHooks.scrollTop=_a.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},r.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},r.fx=_a.prototype.init,r.fx.step={};var ab,bb,cb=/^(?:toggle|show|hide)$/,db=/queueHooks$/;function eb(){bb&&(d.hidden===!1&&a.requestAnimationFrame?a.requestAnimationFrame(eb):a.setTimeout(eb,r.fx.interval),r.fx.tick())}function fb(){return a.setTimeout(function(){ab=void 0}),ab=r.now()}function gb(a,b){var c,d=0,e={height:a};for(b=b?1:0;d<4;d+=2-b)c=ca[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function hb(a,b,c){for(var d,e=(kb.tweeners[b]||[]).concat(kb.tweeners["*"]),f=0,g=e.length;f<g;f++)if(d=e[f].call(c,b,a))return d}function ib(a,b,c){var d,e,f,g,h,i,j,k,l="width"in b||"height"in b,m=this,n={},o=a.style,p=a.nodeType&&da(a),q=W.get(a,"fxshow");c.queue||(g=r._queueHooks(a,"fx"),null==g.unqueued&&(g.unqueued=0,h=g.empty.fire,g.empty.fire=function(){g.unqueued||h()}),g.unqueued++,m.always(function(){m.always(function(){g.unqueued--,r.queue(a,"fx").length||g.empty.fire()})}));for(d in b)if(e=b[d],cb.test(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}n[d]=q&&q[d]||r.style(a,d)}if(i=!r.isEmptyObject(b),i||!r.isEmptyObject(n)){l&&1===a.nodeType&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=q&&q.display,null==j&&(j=W.get(a,"display")),k=r.css(a,"display"),"none"===k&&(j?k=j:(ia([a],!0),j=a.style.display||j,k=r.css(a,"display"),ia([a]))),("inline"===k||"inline-block"===k&&null!=j)&&"none"===r.css(a,"float")&&(i||(m.done(function(){o.display=j}),null==j&&(k=o.display,j="none"===k?"":k)),o.display="inline-block")),c.overflow&&(o.overflow="hidden",m.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]})),i=!1;for(d in n)i||(q?"hidden"in q&&(p=q.hidden):q=W.access(a,"fxshow",{display:j}),f&&(q.hidden=!p),p&&ia([a],!0),m.done(function(){p||ia([a]),W.remove(a,"fxshow");for(d in n)r.style(a,d,n[d])})),i=hb(p?q[d]:0,d,m),d in q||(q[d]=i.start,p&&(i.end=i.start,i.start=0))}}function jb(a,b){var c,d,e,f,g;for(c in a)if(d=r.camelCase(c),e=b[d],f=a[c],Array.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=r.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function kb(a,b,c){var d,e,f=0,g=kb.prefilters.length,h=r.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=ab||fb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;g<i;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),f<1&&i?c:(i||h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:r.extend({},b),opts:r.extend(!0,{specialEasing:{},easing:r.easing._default},c),originalProperties:b,originalOptions:c,startTime:ab||fb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=r.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;c<d;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for(jb(k,j.opts.specialEasing);f<g;f++)if(d=kb.prefilters[f].call(j,a,k,j.opts))return r.isFunction(d.stop)&&(r._queueHooks(j.elem,j.opts.queue).stop=r.proxy(d.stop,d)),d;return r.map(k,hb,j),r.isFunction(j.opts.start)&&j.opts.start.call(a,j),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always),r.fx.timer(r.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j}r.Animation=r.extend(kb,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return fa(c.elem,a,ba.exec(b),c),c}]},tweener:function(a,b){r.isFunction(a)?(b=a,a=["*"]):a=a.match(L);for(var c,d=0,e=a.length;d<e;d++)c=a[d],kb.tweeners[c]=kb.tweeners[c]||[],kb.tweeners[c].unshift(b)},prefilters:[ib],prefilter:function(a,b){b?kb.prefilters.unshift(a):kb.prefilters.push(a)}}),r.speed=function(a,b,c){var d=a&&"object"==typeof a?r.extend({},a):{complete:c||!c&&b||r.isFunction(a)&&a,duration:a,easing:c&&b||b&&!r.isFunction(b)&&b};return r.fx.off?d.duration=0:"number"!=typeof d.duration&&(d.duration in r.fx.speeds?d.duration=r.fx.speeds[d.duration]:d.duration=r.fx.speeds._default),null!=d.queue&&d.queue!==!0||(d.queue="fx"),d.old=d.complete,d.complete=function(){r.isFunction(d.old)&&d.old.call(this),d.queue&&r.dequeue(this,d.queue)},d},r.fn.extend({fadeTo:function(a,b,c,d){return this.filter(da).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=r.isEmptyObject(a),f=r.speed(b,c,d),g=function(){var b=kb(this,r.extend({},a),f);(e||W.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=r.timers,g=W.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&db.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));!b&&c||r.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=W.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=r.timers,g=d?d.length:0;for(c.finish=!0,r.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;b<g;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),r.each(["toggle","show","hide"],function(a,b){var c=r.fn[b];r.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(gb(b,!0),a,d,e)}}),r.each({slideDown:gb("show"),slideUp:gb("hide"),slideToggle:gb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){r.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),r.timers=[],r.fx.tick=function(){var a,b=0,c=r.timers;for(ab=r.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||r.fx.stop(),ab=void 0},r.fx.timer=function(a){r.timers.push(a),r.fx.start()},r.fx.interval=13,r.fx.start=function(){bb||(bb=!0,eb())},r.fx.stop=function(){bb=null},r.fx.speeds={slow:600,fast:200,_default:400},r.fn.delay=function(b,c){return b=r.fx?r.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a=d.createElement("input"),b=d.createElement("select"),c=b.appendChild(d.createElement("option"));a.type="checkbox",o.checkOn=""!==a.value,o.optSelected=c.selected,a=d.createElement("input"),a.value="t",a.type="radio",o.radioValue="t"===a.value}();var lb,mb=r.expr.attrHandle;r.fn.extend({attr:function(a,b){return T(this,r.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){r.removeAttr(this,a)})}}),r.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?r.prop(a,b,c):(1===f&&r.isXMLDoc(a)||(e=r.attrHooks[b.toLowerCase()]||(r.expr.match.bool.test(b)?lb:void 0)),void 0!==c?null===c?void r.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=r.find.attr(a,b),
+null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"===b&&B(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d=0,e=b&&b.match(L);if(e&&1===a.nodeType)while(c=e[d++])a.removeAttribute(c)}}),lb={set:function(a,b,c){return b===!1?r.removeAttr(a,c):a.setAttribute(c,c),c}},r.each(r.expr.match.bool.source.match(/\w+/g),function(a,b){var c=mb[b]||r.find.attr;mb[b]=function(a,b,d){var e,f,g=b.toLowerCase();return d||(f=mb[g],mb[g]=e,e=null!=c(a,b,d)?g:null,mb[g]=f),e}});var nb=/^(?:input|select|textarea|button)$/i,ob=/^(?:a|area)$/i;r.fn.extend({prop:function(a,b){return T(this,r.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[r.propFix[a]||a]})}}),r.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&r.isXMLDoc(a)||(b=r.propFix[b]||b,e=r.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=r.find.attr(a,"tabindex");return b?parseInt(b,10):nb.test(a.nodeName)||ob.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),o.optSelected||(r.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),r.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){r.propFix[this.toLowerCase()]=this});function pb(a){var b=a.match(L)||[];return b.join(" ")}function qb(a){return a.getAttribute&&a.getAttribute("class")||""}r.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).addClass(a.call(this,b,qb(this)))});if("string"==typeof a&&a){b=a.match(L)||[];while(c=this[i++])if(e=qb(c),d=1===c.nodeType&&" "+pb(e)+" "){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=pb(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).removeClass(a.call(this,b,qb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(L)||[];while(c=this[i++])if(e=qb(c),d=1===c.nodeType&&" "+pb(e)+" "){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=pb(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):r.isFunction(a)?this.each(function(c){r(this).toggleClass(a.call(this,c,qb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=r(this),f=a.match(L)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=qb(this),b&&W.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":W.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+pb(qb(c))+" ").indexOf(b)>-1)return!0;return!1}});var rb=/\r/g;r.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=r.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,r(this).val()):a,null==e?e="":"number"==typeof e?e+="":Array.isArray(e)&&(e=r.map(e,function(a){return null==a?"":a+""})),b=r.valHooks[this.type]||r.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=r.valHooks[e.type]||r.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(rb,""):null==c?"":c)}}}),r.extend({valHooks:{option:{get:function(a){var b=r.find.attr(a,"value");return null!=b?b:pb(r.text(a))}},select:{get:function(a){var b,c,d,e=a.options,f=a.selectedIndex,g="select-one"===a.type,h=g?null:[],i=g?f+1:e.length;for(d=f<0?i:g?f:0;d<i;d++)if(c=e[d],(c.selected||d===f)&&!c.disabled&&(!c.parentNode.disabled||!B(c.parentNode,"optgroup"))){if(b=r(c).val(),g)return b;h.push(b)}return h},set:function(a,b){var c,d,e=a.options,f=r.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=r.inArray(r.valHooks.option.get(d),f)>-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),r.each(["radio","checkbox"],function(){r.valHooks[this]={set:function(a,b){if(Array.isArray(b))return a.checked=r.inArray(r(a).val(),b)>-1}},o.checkOn||(r.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var sb=/^(?:focusinfocus|focusoutblur)$/;r.extend(r.event,{trigger:function(b,c,e,f){var g,h,i,j,k,m,n,o=[e||d],p=l.call(b,"type")?b.type:b,q=l.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!sb.test(p+r.event.triggered)&&(p.indexOf(".")>-1&&(q=p.split("."),p=q.shift(),q.sort()),k=p.indexOf(":")<0&&"on"+p,b=b[r.expando]?b:new r.Event(p,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=q.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:r.makeArray(c,[b]),n=r.event.special[p]||{},f||!n.trigger||n.trigger.apply(e,c)!==!1)){if(!f&&!n.noBubble&&!r.isWindow(e)){for(j=n.delegateType||p,sb.test(j+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),i=h;i===(e.ownerDocument||d)&&o.push(i.defaultView||i.parentWindow||a)}g=0;while((h=o[g++])&&!b.isPropagationStopped())b.type=g>1?j:n.bindType||p,m=(W.get(h,"events")||{})[b.type]&&W.get(h,"handle"),m&&m.apply(h,c),m=k&&h[k],m&&m.apply&&U(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=p,f||b.isDefaultPrevented()||n._default&&n._default.apply(o.pop(),c)!==!1||!U(e)||k&&r.isFunction(e[p])&&!r.isWindow(e)&&(i=e[k],i&&(e[k]=null),r.event.triggered=p,e[p](),r.event.triggered=void 0,i&&(e[k]=i)),b.result}},simulate:function(a,b,c){var d=r.extend(new r.Event,c,{type:a,isSimulated:!0});r.event.trigger(d,null,b)}}),r.fn.extend({trigger:function(a,b){return this.each(function(){r.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];if(c)return r.event.trigger(a,b,c,!0)}}),r.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(a,b){r.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),r.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),o.focusin="onfocusin"in a,o.focusin||r.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){r.event.simulate(b,a.target,r.event.fix(a))};r.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=W.access(d,b);e||d.addEventListener(a,c,!0),W.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=W.access(d,b)-1;e?W.access(d,b,e):(d.removeEventListener(a,c,!0),W.remove(d,b))}}});var tb=a.location,ub=r.now(),vb=/\?/;r.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return c&&!c.getElementsByTagName("parsererror").length||r.error("Invalid XML: "+b),c};var wb=/\[\]$/,xb=/\r?\n/g,yb=/^(?:submit|button|image|reset|file)$/i,zb=/^(?:input|select|textarea|keygen)/i;function Ab(a,b,c,d){var e;if(Array.isArray(b))r.each(b,function(b,e){c||wb.test(a)?d(a,e):Ab(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==r.type(b))d(a,b);else for(e in b)Ab(a+"["+e+"]",b[e],c,d)}r.param=function(a,b){var c,d=[],e=function(a,b){var c=r.isFunction(b)?b():b;d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(null==c?"":c)};if(Array.isArray(a)||a.jquery&&!r.isPlainObject(a))r.each(a,function(){e(this.name,this.value)});else for(c in a)Ab(c,a[c],b,e);return d.join("&")},r.fn.extend({serialize:function(){return r.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=r.prop(this,"elements");return a?r.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!r(this).is(":disabled")&&zb.test(this.nodeName)&&!yb.test(a)&&(this.checked||!ja.test(a))}).map(function(a,b){var c=r(this).val();return null==c?null:Array.isArray(c)?r.map(c,function(a){return{name:b.name,value:a.replace(xb,"\r\n")}}):{name:b.name,value:c.replace(xb,"\r\n")}}).get()}});var Bb=/%20/g,Cb=/#.*$/,Db=/([?&])_=[^&]*/,Eb=/^(.*?):[ \t]*([^\r\n]*)$/gm,Fb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Gb=/^(?:GET|HEAD)$/,Hb=/^\/\//,Ib={},Jb={},Kb="*/".concat("*"),Lb=d.createElement("a");Lb.href=tb.href;function Mb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(L)||[];if(r.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Nb(a,b,c,d){var e={},f=a===Jb;function g(h){var i;return e[h]=!0,r.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Ob(a,b){var c,d,e=r.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&r.extend(!0,a,d),a}function Pb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}if(f)return f!==i[0]&&i.unshift(f),c[f]}function Qb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}r.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:tb.href,type:"GET",isLocal:Fb.test(tb.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Kb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":r.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Ob(Ob(a,r.ajaxSettings),b):Ob(r.ajaxSettings,a)},ajaxPrefilter:Mb(Ib),ajaxTransport:Mb(Jb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m,n,o=r.ajaxSetup({},c),p=o.context||o,q=o.context&&(p.nodeType||p.jquery)?r(p):r.event,s=r.Deferred(),t=r.Callbacks("once memory"),u=o.statusCode||{},v={},w={},x="canceled",y={readyState:0,getResponseHeader:function(a){var b;if(k){if(!h){h={};while(b=Eb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return k?g:null},setRequestHeader:function(a,b){return null==k&&(a=w[a.toLowerCase()]=w[a.toLowerCase()]||a,v[a]=b),this},overrideMimeType:function(a){return null==k&&(o.mimeType=a),this},statusCode:function(a){var b;if(a)if(k)y.always(a[y.status]);else for(b in a)u[b]=[u[b],a[b]];return this},abort:function(a){var b=a||x;return e&&e.abort(b),A(0,b),this}};if(s.promise(y),o.url=((b||o.url||tb.href)+"").replace(Hb,tb.protocol+"//"),o.type=c.method||c.type||o.method||o.type,o.dataTypes=(o.dataType||"*").toLowerCase().match(L)||[""],null==o.crossDomain){j=d.createElement("a");try{j.href=o.url,j.href=j.href,o.crossDomain=Lb.protocol+"//"+Lb.host!=j.protocol+"//"+j.host}catch(z){o.crossDomain=!0}}if(o.data&&o.processData&&"string"!=typeof o.data&&(o.data=r.param(o.data,o.traditional)),Nb(Ib,o,c,y),k)return y;l=r.event&&o.global,l&&0===r.active++&&r.event.trigger("ajaxStart"),o.type=o.type.toUpperCase(),o.hasContent=!Gb.test(o.type),f=o.url.replace(Cb,""),o.hasContent?o.data&&o.processData&&0===(o.contentType||"").indexOf("application/x-www-form-urlencoded")&&(o.data=o.data.replace(Bb,"+")):(n=o.url.slice(f.length),o.data&&(f+=(vb.test(f)?"&":"?")+o.data,delete o.data),o.cache===!1&&(f=f.replace(Db,"$1"),n=(vb.test(f)?"&":"?")+"_="+ub++ +n),o.url=f+n),o.ifModified&&(r.lastModified[f]&&y.setRequestHeader("If-Modified-Since",r.lastModified[f]),r.etag[f]&&y.setRequestHeader("If-None-Match",r.etag[f])),(o.data&&o.hasContent&&o.contentType!==!1||c.contentType)&&y.setRequestHeader("Content-Type",o.contentType),y.setRequestHeader("Accept",o.dataTypes[0]&&o.accepts[o.dataTypes[0]]?o.accepts[o.dataTypes[0]]+("*"!==o.dataTypes[0]?", "+Kb+"; q=0.01":""):o.accepts["*"]);for(m in o.headers)y.setRequestHeader(m,o.headers[m]);if(o.beforeSend&&(o.beforeSend.call(p,y,o)===!1||k))return y.abort();if(x="abort",t.add(o.complete),y.done(o.success),y.fail(o.error),e=Nb(Jb,o,c,y)){if(y.readyState=1,l&&q.trigger("ajaxSend",[y,o]),k)return y;o.async&&o.timeout>0&&(i=a.setTimeout(function(){y.abort("timeout")},o.timeout));try{k=!1,e.send(v,A)}catch(z){if(k)throw z;A(-1,z)}}else A(-1,"No Transport");function A(b,c,d,h){var j,m,n,v,w,x=c;k||(k=!0,i&&a.clearTimeout(i),e=void 0,g=h||"",y.readyState=b>0?4:0,j=b>=200&&b<300||304===b,d&&(v=Pb(o,y,d)),v=Qb(o,v,y,j),j?(o.ifModified&&(w=y.getResponseHeader("Last-Modified"),w&&(r.lastModified[f]=w),w=y.getResponseHeader("etag"),w&&(r.etag[f]=w)),204===b||"HEAD"===o.type?x="nocontent":304===b?x="notmodified":(x=v.state,m=v.data,n=v.error,j=!n)):(n=x,!b&&x||(x="error",b<0&&(b=0))),y.status=b,y.statusText=(c||x)+"",j?s.resolveWith(p,[m,x,y]):s.rejectWith(p,[y,x,n]),y.statusCode(u),u=void 0,l&&q.trigger(j?"ajaxSuccess":"ajaxError",[y,o,j?m:n]),t.fireWith(p,[y,x]),l&&(q.trigger("ajaxComplete",[y,o]),--r.active||r.event.trigger("ajaxStop")))}return y},getJSON:function(a,b,c){return r.get(a,b,c,"json")},getScript:function(a,b){return r.get(a,void 0,b,"script")}}),r.each(["get","post"],function(a,b){r[b]=function(a,c,d,e){return r.isFunction(c)&&(e=e||d,d=c,c=void 0),r.ajax(r.extend({url:a,type:b,dataType:e,data:c,success:d},r.isPlainObject(a)&&a))}}),r._evalUrl=function(a){return r.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},r.fn.extend({wrapAll:function(a){var b;return this[0]&&(r.isFunction(a)&&(a=a.call(this[0])),b=r(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this},wrapInner:function(a){return r.isFunction(a)?this.each(function(b){r(this).wrapInner(a.call(this,b))}):this.each(function(){var b=r(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=r.isFunction(a);return this.each(function(c){r(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(a){return this.parent(a).not("body").each(function(){r(this).replaceWith(this.childNodes)}),this}}),r.expr.pseudos.hidden=function(a){return!r.expr.pseudos.visible(a)},r.expr.pseudos.visible=function(a){return!!(a.offsetWidth||a.offsetHeight||a.getClientRects().length)},r.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Rb={0:200,1223:204},Sb=r.ajaxSettings.xhr();o.cors=!!Sb&&"withCredentials"in Sb,o.ajax=Sb=!!Sb,r.ajaxTransport(function(b){var c,d;if(o.cors||Sb&&!b.crossDomain)return{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Rb[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}}),r.ajaxPrefilter(function(a){a.crossDomain&&(a.contents.script=!1)}),r.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return r.globalEval(a),a}}}),r.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),r.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=r("<script>").prop({charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&f("error"===a.type?404:200,a.type)}),d.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Tb=[],Ub=/(=)\?(?=&|$)|\?\?/;r.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Tb.pop()||r.expando+"_"+ub++;return this[a]=!0,a}}),r.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Ub.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ub.test(b.data)&&"data");if(h||"jsonp"===b.dataTypes[0])return e=b.jsonpCallback=r.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Ub,"$1"+e):b.jsonp!==!1&&(b.url+=(vb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||r.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?r(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Tb.push(e)),g&&r.isFunction(f)&&f(g[0]),g=f=void 0}),"script"}),o.createHTMLDocument=function(){var a=d.implementation.createHTMLDocument("").body;return a.innerHTML="<form></form><form></form>",2===a.childNodes.length}(),r.parseHTML=function(a,b,c){if("string"!=typeof a)return[];"boolean"==typeof b&&(c=b,b=!1);var e,f,g;return b||(o.createHTMLDocument?(b=d.implementation.createHTMLDocument(""),e=b.createElement("base"),e.href=d.location.href,b.head.appendChild(e)):b=d),f=C.exec(a),g=!c&&[],f?[b.createElement(f[1])]:(f=qa([a],b,g),g&&g.length&&r(g).remove(),r.merge([],f.childNodes))},r.fn.load=function(a,b,c){var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=pb(a.slice(h)),a=a.slice(0,h)),r.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&r.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?r("<div>").append(r.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},r.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){r.fn[b]=function(a){return this.on(b,a)}}),r.expr.pseudos.animated=function(a){return r.grep(r.timers,function(b){return a===b.elem}).length},r.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=r.css(a,"position"),l=r(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=r.css(a,"top"),i=r.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),r.isFunction(b)&&(b=b.call(a,c,r.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},r.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){r.offset.setOffset(this,a,b)});var b,c,d,e,f=this[0];if(f)return f.getClientRects().length?(d=f.getBoundingClientRect(),b=f.ownerDocument,c=b.documentElement,e=b.defaultView,{top:d.top+e.pageYOffset-c.clientTop,left:d.left+e.pageXOffset-c.clientLeft}):{top:0,left:0}},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===r.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),B(a[0],"html")||(d=a.offset()),d={top:d.top+r.css(a[0],"borderTopWidth",!0),left:d.left+r.css(a[0],"borderLeftWidth",!0)}),{top:b.top-d.top-r.css(c,"marginTop",!0),left:b.left-d.left-r.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&"static"===r.css(a,"position"))a=a.offsetParent;return a||ra})}}),r.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c="pageYOffset"===b;r.fn[a]=function(d){return T(this,function(a,d,e){var f;return r.isWindow(a)?f=a:9===a.nodeType&&(f=a.defaultView),void 0===e?f?f[b]:a[d]:void(f?f.scrollTo(c?f.pageXOffset:e,c?e:f.pageYOffset):a[d]=e)},a,d,arguments.length)}}),r.each(["top","left"],function(a,b){r.cssHooks[b]=Pa(o.pixelPosition,function(a,c){if(c)return c=Oa(a,b),Ma.test(c)?r(a).position()[b]+"px":c})}),r.each({Height:"height",Width:"width"},function(a,b){r.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){r.fn[d]=function(e,f){var g=arguments.length&&(c||"boolean"!=typeof e),h=c||(e===!0||f===!0?"margin":"border");return T(this,function(b,c,e){var f;return r.isWindow(b)?0===d.indexOf("outer")?b["inner"+a]:b.document.documentElement["client"+a]:9===b.nodeType?(f=b.documentElement,Math.max(b.body["scroll"+a],f["scroll"+a],b.body["offset"+a],f["offset"+a],f["client"+a])):void 0===e?r.css(b,c,h):r.style(b,c,e,h)},b,g?e:void 0,g)}})}),r.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}}),r.holdReady=function(a){a?r.readyWait++:r.ready(!0)},r.isArray=Array.isArray,r.parseJSON=JSON.parse,r.nodeName=B,"function"==typeof define&&define.amd&&define("jquery",[],function(){return r});var Vb=a.jQuery,Wb=a.$;return r.noConflict=function(b){return a.$===r&&(a.$=Wb),b&&a.jQuery===r&&(a.jQuery=Vb),r},b||(a.jQuery=a.$=r),r});
diff --git a/static/templates/management.html b/static/templates/management.html
index f11bb00..4d68f2b 100644
--- a/static/templates/management.html
+++ b/static/templates/management.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+        <script src="/static/js/jquery.min.js"></script>
     <title>Select Wi-Fi</title>
 
     <link rel="stylesheet" href="/static/css/application.css" />
diff --git a/static/templates/operational.html b/static/templates/operational.html
index 27d4f94..9d2cd89 100644
--- a/static/templates/operational.html
+++ b/static/templates/operational.html
@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1" />
 	<title>Wifi Connected</title>
         <link rel="stylesheet" href="/static/css/application.css" />
-        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+        <script src="/static/js/jquery.min.js"></script>
 </head>
 
 <body>
diff --git a/utils/config.go b/utils/config.go
index bd23686..2cba34c 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -4,41 +4,47 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"log"
 	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
-
-	"launchpad.net/wifi-connect/wifiap"
 )
 
-var configFile = filepath.Join(os.Getenv("SNAP_COMMON"), "pre-config.json")
+var configFile = filepath.Join(os.Getenv("SNAP_COMMON"), "config.json")
 var mustConfigFlagFile = filepath.Join(os.Getenv("SNAP_COMMON"), "config_done.flag")
 
-var wifiapClient wifiap.Operations = wifiap.DefaultClient()
-
 // Config this project config got from wifi-ap + custom wifi-connect params
 type Config struct {
-	Wifi   *WifiConfig
-	Portal *PortalConfig
+	Wifi   WifiConfig   `json:"wifi"`
+	Portal PortalConfig `json:"portal"`
+	// If set, once we have connected to an AP once, we do not enter
+	// managing mode when the service is re-started, even if we are
+	// not able to reconnect to said AP. To change that, we would
+	// have to use the operational portal.
+	ConfigWifiOnce bool `json:"config-wifi-once"`
 }
 
 // WifiConfig config specific parameters for wifi configuration
 type WifiConfig struct {
-	Ssid          string `json:"wifi.ssid"`
-	Passphrase    string `json:"wifi.security-passphrase"`
-	Interface     string `json:"wifi.interface"`
-	CountryCode   string `json:"wifi.country-code"`
-	Channel       int    `json:"wifi.channel"`
-	OperationMode string `json:"wifi.operation-mode"`
+	Ssid          string `json:"ssid"`
+	Passphrase    string `json:"security-passphrase"`
+	Interface     string `json:"interface"`
+	CountryCode   string `json:"country-code"`
+	Channel       int    `json:"channel"`
+	OperationMode string `json:"operation-mode"`
+	// Subnet for our AP, in CIDR format
+	Subnet string `json:"subnet"`
 }
 
 // PortalConfig config specific parameters for portals configuration
 type PortalConfig struct {
-	Password           string //`json:"portal.password"`
-	NoResetCredentials bool   `json:"portal.no-reset-creds"`
-	NoOperational      bool   `json:"portal.no-operational"`
+	Password string `json:"password"`
+	// Port where we will be listening
+	Port int `json:"port"`
+	// whether user must reset passphrase and password on first use of mgmt portal
+	NoResetCredentials bool `json:"no-reset-creds"`
+	// whether to show the operational portal
+	Operational bool `json:"operational"`
 }
 
 func (c *Config) String() string {
@@ -52,8 +58,11 @@ func (c *Config) String() string {
 func (c *PortalConfig) String() string {
 	s := []string{
 		strings.Join([]string{"Password: ", c.Password}, " "),
-		strings.Join([]string{"NoResetCredentials:", strconv.FormatBool(c.NoResetCredentials)}, " "),
-		strings.Join([]string{"NoOperational:", strconv.FormatBool(c.NoOperational)}, " "),
+		strings.Join([]string{"Port:", strconv.Itoa(c.Port)}, " "),
+		strings.Join([]string{"NoResetCredentials:",
+			strconv.FormatBool(c.NoResetCredentials)}, " "),
+		strings.Join([]string{"Operational:",
+			strconv.FormatBool(c.Operational)}, " "),
 	}
 	return fmt.Sprintf(strings.Join(s, "\n"))
 }
@@ -66,161 +75,67 @@ func (c *WifiConfig) String() string {
 		strings.Join([]string{"CountryCode:", c.CountryCode}, " "),
 		strings.Join([]string{"Channel:", strconv.Itoa(c.Channel)}, " "),
 		strings.Join([]string{"OperationMode:", c.OperationMode}, " "),
+		strings.Join([]string{"Subnet:", c.Subnet}, " "),
 	}
 	return fmt.Sprintf(strings.Join(s, "\n"))
 }
 
-func defaultPortalConfig() *PortalConfig {
-	return &PortalConfig{
-		Password:           "",
-		NoResetCredentials: false,
-		NoOperational:      false,
-	}
-}
-
-// config currently stored in local json file is completely storable in PortalConfig
-// If needed to scale, we could rewrite this method to support a more generic type
-func readLocalConfig() (*PortalConfig, error) {
-	if _, err := os.Stat(configFile); os.IsNotExist(err) {
-		log.Printf("Warn: not found local config file at %v\n", configFile)
-		// in case there is no local config file, return a null pointer
-		return nil, nil
-	}
+// LoadConfig loads configuration file
+func LoadConfig() (*Config, error) {
+	config := &Config{}
+	// Set some defaults
+	config.Portal.Port = 8085
+	config.Wifi.Subnet = "10.25.52.1/24"
 
-	fileContents, err := ioutil.ReadFile(configFile)
+	content, err := ioutil.ReadFile(configFile)
 	if err != nil {
-		return nil, fmt.Errorf("Error reading json config file: %v", err)
+		return config, err
 	}
-
-	// parameters not available in config file will be se to default value
-	portalConfig := defaultPortalConfig()
-	err = json.Unmarshal(fileContents, portalConfig)
-	if err != nil {
-		return nil, fmt.Errorf("Error unmarshalling json config file contents: %v", err)
-	}
-
-	return portalConfig, nil
-}
-
-func writeLocalConfig(p *PortalConfig) error {
-	// the only writable local config param is the password, stored as a hash
-	_, err := HashIt(p.Password)
+	err = json.Unmarshal(content, config)
 	if err != nil {
-		return fmt.Errorf("Could not hash portal password to file: %v", err)
+		return config, err
 	}
-
-	return nil
+	return config, nil
 }
 
-func readRemoteParam(m map[string]interface{}, key string, defaultValue interface{}) interface{} {
-	val, ok := m[key]
-	if !ok {
-		val = defaultValue
-		log.Printf("Warning: %v key was not found in remote config", key)
-	}
-
-	return val
-}
-
-func readRemoteConfig() (*WifiConfig, error) {
-	settings, err := wifiapClient.Show()
+// WriteConfigFile writes configuration file
+func WriteConfigFile(config *Config) error {
+	b, err := json.Marshal(config)
 	if err != nil {
-		return nil, fmt.Errorf("Error reading wifi-ap remote configuration: %v", err)
-	}
-
-	// NOTE: Preprocessing for the case of wifi.channel.
-	// In the case of the channel, it is returned as string from rest api, but we have to convert it
-	// as it is handled as int internally.
-	// In case wifi-ap provides this in future as int, this could be replaced by
-	//
-	// readRemoteParam(settings, "wifi.channel", 0).(int)
-	channel, err := strconv.Atoi(readRemoteParam(settings, "wifi.channel", "0").(string))
-	if err != nil {
-		return nil, fmt.Errorf("Could not parse wifi.channel parameter: %v", err)
+		return err
 	}
 
-	return &WifiConfig{
-		Ssid:          readRemoteParam(settings, "wifi.ssid", "").(string),
-		Passphrase:    readRemoteParam(settings, "wifi.security-passphrase", "").(string),
-		Interface:     readRemoteParam(settings, "wifi.interface", "").(string),
-		CountryCode:   readRemoteParam(settings, "wifi.country-code", "").(string),
-		Channel:       channel,
-		OperationMode: readRemoteParam(settings, "wifi.operation-mode", "").(string),
-	}, nil
-}
-
-func writeRemoteConfig(wc *WifiConfig) error {
-	params := make(map[string]interface{})
-	params["wifi.ssid"] = wc.Ssid
-	params["wifi.security-passphrase"] = wc.Passphrase
-	params["wifi.interface"] = wc.Interface
-	params["wifi.country-code"] = wc.CountryCode
-	params["wifi.channel"] = wc.Channel
-	params["wifi.operation-mode"] = wc.OperationMode
-
-	err := wifiapClient.Set(params)
+	err = ioutil.WriteFile(configFile, b, 0644)
 	if err != nil {
-		return fmt.Errorf("Error writing remote configuration: %v", err)
+		return err
 	}
 
 	return nil
 }
 
-// ReadConfig reads all config, remote and local, at the same time
-var ReadConfig = func() (*Config, error) {
-	wifiConfig, err := readRemoteConfig()
-	if err != nil {
-		return nil, err
-	}
-
-	portalConfig, err := readLocalConfig()
+func writeConfig(p *PortalConfig) error {
+	// Just take password, stored as a hash
+	_, err := HashIt(p.Password)
 	if err != nil {
-		return nil, err
-	}
-
-	// if local config is nil, fill returning object with default values
-	if portalConfig == nil {
-		portalConfig = defaultPortalConfig()
+		return fmt.Errorf("Could not hash portal password to file: %v", err)
 	}
 
-	return &Config{Wifi: wifiConfig, Portal: portalConfig}, nil
+	return nil
 }
 
-// WriteConfig writes all remote and local config at the same time
+// WriteConfig writes configuration
 var WriteConfig = func(c *Config) error {
-	previousRemoteConfig, err := readRemoteConfig()
-	if err != nil {
-		return fmt.Errorf("Error reading current remote config before applying new one: %v", err)
-	}
-
-	// only write remote config if it's different from current
-	if *previousRemoteConfig != *c.Wifi {
-		err = writeRemoteConfig(c.Wifi)
-		if err != nil {
-			// if an error happens writing remote config there is no need to restore
-			// backup, as nothing shouldn't have been written
-			return err
-		}
-	}
-
-	err = writeLocalConfig(c.Portal)
+	err := writeConfig(&c.Portal)
 	if err != nil {
-		// rollback
-		if previousRemoteConfig != nil {
-			backupErr := writeRemoteConfig(previousRemoteConfig)
-			if backupErr != nil {
-				return fmt.Errorf("Could not restore previous remote configuration: %v\n after error: %v", backupErr, err)
-			}
-		}
 		return err
 	}
 
-	// write flag file for not asking more times for configuring snap before first use
-	if MustSetConfig() {
-		err = WriteFlagFile(mustConfigFlagFile)
-		if err != nil {
-			return fmt.Errorf("Error writing flag file after configuring for a first time")
-		}
+	// write flag file for not asking more times for configuring snap before
+	// first use
+	err = WriteFlagFile(mustConfigFlagFile)
+	if err != nil {
+		return fmt.Errorf("Error writing flag file after " +
+			"configuring for a first time")
 	}
 
 	return nil
@@ -228,8 +143,11 @@ var WriteConfig = func(c *Config) error {
 
 // MustSetConfig true if one needs to configure snap before continuing
 var MustSetConfig = func() bool {
-	if _, err := os.Stat(mustConfigFlagFile); os.IsNotExist(err) {
-		return true
-	}
+	// TODO Do not request portal configuration for the moment. It is not
+	// clear if it makes sense as we will be using wifi-connect only once
+	// to select an AP.
+	// if _, err := os.Stat(mustConfigFlagFile); os.IsNotExist(err) {
+	// 	return true
+	// }
 	return false
 }
diff --git a/utils/config_test.go b/utils/config_test.go
index 1802a60..b4339ed 100644
--- a/utils/config_test.go
+++ b/utils/config_test.go
@@ -4,61 +4,37 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"path/filepath"
-	"strconv"
-	"sync"
 	"testing"
-	"time"
 
 	"gopkg.in/check.v1"
 )
 
-const testLocalConfig = `
-{
-	"portal.no-reset-creds": true,
-	"portal.no-operational": false	
+const testConfig1 = `{
+    "wifi": {
+        "ssid": "confconn",
+        "security-passphrase": "mypassphrase",
+        "interface": "wlp1s1",
+        "country-code": "ES",
+        "channel": 6 ,
+        "operation-mode": "g",
+        "subnet": "23.23.23.23/16"
+    },
+    "portal": {
+        "password": "mypassword",
+        "port": 9009,
+        "no-reset-creds": false,
+        "operational": true
+    },
+    "config-wifi-once": true
 }
 `
 
-const testLocalConfigBadEntry = `
-{
-	"portal.password": "the_password",
-	"portal.no-reset-creds": true,
-	"bad.parameter": "bad.value",
-	"portal.no-operational": false
-}
-`
-
-const testLocalEmptyConfig = `
-{
-}
-`
-
-var testPortalConfig = &PortalConfig{"the_password", true, false}
-
-var rand uint32
-var randmu sync.Mutex
-
+// Hook up gocheck into the "go test" runner.
 func Test(t *testing.T) { check.TestingT(t) }
 
-type S struct{}
-
-var _ = check.Suite(&S{})
+type CfgSuite struct{}
 
-// ####################
-// Testing local config
-// ####################
-func randomName() string {
-	randmu.Lock()
-	r := rand
-	if r == 0 {
-		r = uint32(time.Now().UnixNano() + int64(os.Getpid()))
-	}
-	r = r*1664525 + 1013904223 // constants from Numerical Recipes
-	rand = r
-	randmu.Unlock()
-	return strconv.Itoa(int(1e9 + r%1e9))[1:]
-}
+var _ = check.Suite(&CfgSuite{})
 
 func createTempFile(content string) (*os.File, error) {
 	contentAsBytes := []byte(content)
@@ -79,465 +55,52 @@ func createTempFile(content string) (*os.File, error) {
 	return tmpfile, nil
 }
 
-func verifyLocalConfig(c *check.C, cfg *PortalConfig, expectedPwd string, expectedNoResetCredentials bool, expectedNoOperational bool) {
-	c.Assert(cfg.Password, check.Equals, expectedPwd)
-	c.Assert(cfg.NoResetCredentials, check.Equals, expectedNoResetCredentials)
-	c.Assert(cfg.NoOperational, check.Equals, expectedNoOperational)
-}
-
-func verifyDefaultLocalConfig(c *check.C, cfg *PortalConfig) {
-	verifyLocalConfig(c, cfg, "", false, false)
-}
-
-func (s *S) TestReadLocalConfig(c *check.C) {
-	f, err := createTempFile(testLocalConfig)
+func (s *CfgSuite) TestReadConfigDefaults(c *check.C) {
+	f, err := createTempFile("{}")
 	c.Assert(err, check.IsNil)
 
-	defer os.Remove(f.Name())
 	configFile = f.Name()
 
-	cfg, err := readLocalConfig()
-	c.Assert(err, check.IsNil)
-
-	verifyLocalConfig(c, cfg, "", true, false)
-}
+	cfg, err := LoadConfig()
 
-func (s *S) TestReadLocalConfigBadEntry(c *check.C) {
-	// No matter if there are additional not recognized params, only known should be marshalled
-	f, err := createTempFile(testLocalConfigBadEntry)
 	c.Assert(err, check.IsNil)
+	c.Assert(cfg.Wifi.Ssid, check.Equals, "")
+	c.Assert(cfg.Wifi.Passphrase, check.Equals, "")
+	c.Assert(cfg.Wifi.Interface, check.Equals, "")
+	c.Assert(cfg.Wifi.CountryCode, check.Equals, "")
+	c.Assert(cfg.Wifi.Channel, check.Equals, 0)
+	c.Assert(cfg.Wifi.OperationMode, check.Equals, "")
+	c.Assert(cfg.Wifi.Subnet, check.Equals, "10.25.52.1/24")
 
-	defer os.Remove(f.Name())
-	configFile = f.Name()
-
-	cfg, err := readLocalConfig()
-	c.Assert(err, check.IsNil)
+	c.Assert(cfg.Portal.Password, check.Equals, "")
+	c.Assert(cfg.Portal.Port, check.Equals, 8085)
+	c.Assert(cfg.Portal.NoResetCredentials, check.Equals, false)
+	c.Assert(cfg.Portal.Operational, check.Equals, false)
 
-	verifyLocalConfig(c, cfg, "", true, false)
+	c.Assert(cfg.ConfigWifiOnce, check.Equals, false)
 }
 
-func (s *S) TestReadLocalEmptyConfig(c *check.C) {
-	// No matter if there are additional not recognized params, only known should be marshalled
-	f, err := createTempFile(testLocalEmptyConfig)
+func (s *CfgSuite) TestReadConfig(c *check.C) {
+	f, err := createTempFile(testConfig1)
 	c.Assert(err, check.IsNil)
 
-	defer os.Remove(f.Name())
 	configFile = f.Name()
 
-	cfg, err := readLocalConfig()
-	c.Assert(err, check.IsNil)
-
-	verifyDefaultLocalConfig(c, cfg)
-}
-
-func (s *S) TestReadLocalNotExistingConfig(c *check.C) {
-	configFile = "does/not/exists/config.json"
-
-	cfg, err := readLocalConfig()
-	c.Assert(err, check.IsNil)
-	c.Assert(cfg, check.IsNil)
-}
-
-func (s *S) TestWriteLocalConfigFileDoesNotExists(c *check.C) {
-	mustConfigFlagFile = filepath.Join(os.TempDir(), "config_done"+randomName())
-	defer os.Remove(mustConfigFlagFile)
-	HashFile = filepath.Join(os.TempDir(), "portalpwd"+randomName())
-	defer os.Remove(HashFile)
+	cfg, err := LoadConfig()
 
-	err := writeLocalConfig(testPortalConfig)
 	c.Assert(err, check.IsNil)
+	c.Assert(cfg.Wifi.Ssid, check.Equals, "confconn")
+	c.Assert(cfg.Wifi.Passphrase, check.Equals, "mypassphrase")
+	c.Assert(cfg.Wifi.Interface, check.Equals, "wlp1s1")
+	c.Assert(cfg.Wifi.CountryCode, check.Equals, "ES")
+	c.Assert(cfg.Wifi.Channel, check.Equals, 6)
+	c.Assert(cfg.Wifi.OperationMode, check.Equals, "g")
+	c.Assert(cfg.Wifi.Subnet, check.Equals, "23.23.23.23/16")
 
-	ok, err := MatchingHash(testPortalConfig.Password)
-	c.Assert(err, check.IsNil)
-	c.Assert(ok, check.Equals, true)
-}
-
-func (s *S) TestWriteLocalConfigFiletExists(c *check.C) {
-	mustConfigFlagFile = filepath.Join(os.TempDir(), "config_done"+randomName())
-	defer os.Remove(mustConfigFlagFile)
-
-	f, err := createTempFile("whateverbadpasswordhash")
-	c.Assert(err, check.IsNil)
-
-	defer os.Remove(f.Name())
-	HashFile = f.Name()
-
-	err = writeLocalConfig(testPortalConfig)
-	c.Assert(err, check.IsNil)
-
-	ok, err := MatchingHash(testPortalConfig.Password)
-	c.Assert(err, check.IsNil)
-	c.Assert(ok, check.Equals, true)
-}
-
-// #####################
-// Testing remote config
-// #####################
-type wifiapClientMock struct {
-	m map[string]interface{}
-}
-
-func (c *wifiapClientMock) Show() (map[string]interface{}, error) {
-	return c.m, nil
-}
-
-func (c *wifiapClientMock) Enable() error {
-	return nil
-}
-