Updated method names for clarity, added more TODO tasks