MOstly working now