made a shitton of changes, will continue working at home