Just some work done

Nothing major finished yet