Major structure change due to asingment

fixed some errors with internet explorer being stupid

Signed-off-by: Lander Ghekiere <lander.ghekiere@gmail.com>