all features working
final commit