Feature/make home sweet home