almost done; needs a few tweaks