Add basics
Merge branch 'Service-controller'
Service class almost works
Clean up window1