Pretty much done, just need scoring and minor tweaks