updated stuff
Working, still no merge
final product