Done working from home

Almost working