added major functionality
final commit