doesnt update table but could very easily be done
Merge https://github.com/proeber/Final-Project
minor fixes