mostly done!!
done! only need to tweak now