Kind of working now.. Not very user friendly