STABLE
FIX: A lot, big refactor, to stabilize, fix jshint