Changed structure and added TODO