working stuff
Latest changes