done , needs a few tweaks for bonus