Full work with things working
This is the latest work