Implemented TODOs for onCreate and onResume