Updated final project with all features