fixed rests of the todo's and made a frontpage.........
fixed the conflict in report
DONE WITH THIS SHIAT