Gave up on the reusable code for now, will work on it later...... maybe

Signed-off-by: Exikle <dixondcunha@hotmail.com>