Finished changing from activities model into fragment model