MARGIN constant
Refactoring (a lot of)
Back to 100% operational (I think)