Its working... mostly
Signed-off-by: zv_odd <zv.odd.101@gmail.com>