Complete rework.
New fancy features