Final Changes and Testing

Checking in all functionalities.