Added some stuff, will try to get it working at home