[18] more work - havent had much time lately

Signed-off-by: https://github.com/Infinity-420 <iceis2@hotmail.com>