work of a few weeks combined in One super commit!