Latest changes

Changes still in the kitchen