done most stuff now just need results screen and a few tweaks