[TASK] Further progress
[TASK] More features