Finished assesment, needs still to fix minor bugs