Rewrite
Merge branch 'Henry-Branch' of https://github.com/HenryBB/Lighter into Henry-Branch