Everything done except Fragment Handling