This is based on some work by Martell, and modified by /me
It's not yet perfectly clean, but that will come in the next commits