diff --git a/Apply_hr.cpp b/Apply_hr.cpp
index 479e5d6..3267ee9 100644
--- a/Apply_hr.cpp
+++ b/Apply_hr.cpp
@@ -1,40 +1,41 @@
 #include<stdio.h>
 #include<string.h>
-#include "C:\Users\tlfzg\Desktop\헤더파일_모음\ciai03.h"
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
 #pragma warning (disable:4996)
-int main(void)
+#pragma warning(disable: 4819)
+int Apply(NewUser saved[N])
 {
-	NewUser saved[N];
+
 	int count = 0;
-	char testPW[N];
-	printf("아이디: ");
+
+	printf("ID : ");
 	scanf("%s", saved[count].ID);
 	while (1)
 	{
-		printf("비밀번호: ");
+		printf("PassWord : ");
 		scanf("%s", saved[count].PW);
 		if (strlen(saved[count].PW) < 9)
 		{
-			printf("비밀번호는 9자리 이상 입력해주세요\n\n");
+			printf("Your password must be over 9 letters!\n\n");
 		}
 		else
 		{
-			printf("비밀번호 확인: ");
-			scanf("%s", testPW);
-			if (!strcmp(saved[count].PW, testPW))
+			printf("PassWord Check: ");
+			scanf("%s", saved[count].testPW);
+			if (!strcmp(saved[count].PW, saved[count].testPW))
 			{
 				getchar();
-				printf("-회원가입 성공-\n");
+				printf("==Success to Apply :)==\n");
 				count++;
-				printf("count 증가확인=%d", count);
+			
 				getchar();
 				return 0;
 				//break;
 			}
 			else
-				printf("비밀번호가 일치하지 않습니다\n\n");
+				printf("WRONG // Check your password\n\n");
 		}
 	}
-		printf("회원가입 실패\n");
+		printf("==Fail to Apply :(==\n");
 		return -1;
 	}
diff --git a/BuildingPrint.cpp b/BuildingPrint.cpp
index bc54278..33d6409 100644
--- a/BuildingPrint.cpp
+++ b/BuildingPrint.cpp
@@ -1,82 +1,34 @@
-#pragma warning (disable:4996)
-#include<stdio.h>
-#include<string.h>
-#include<stdlib.h>
-
-
-typedef struct TImeTable{
-	
-	char RoomNum;
-	
-	char BuildingName;
-
-}TimeTable;
-
-
-
-
-char BuildingPrint(TimeTable info, int ok)
-{
-	int ok;
-	(char*) info[ok];
-	int Building; 
-	int BuildingName;
-
-	printf("건물번호를 입력하세요: ");
-	scanf("%d", &(char*) info[ok].RoomNum);
-	Building = atoi((char*)info[ok].RoomNum);
-
-	printf("건물이름을 입력하세요: ");
-	scanf("%s", &BuildingName);
-	printf("Building==%d\nBuildingName==%s\n", Building, BuildingName );
-
-	
-}
-
-int main()
-{
-	int Building;
-	TimeTable info;
-	int ok;
-	BuildingPrint (info, ok);
-	
-	switch (Building)//Building:건물번호
-				//Case개수가 7개가 최대->모든 정보를 넣는 것에 제한
-				//대부분의 학생들의 시간표에 포함된 7개의 건물들로 할당
-	{
-	case 02:
-		printf("경상관\n");
-		break;
-	case 03:
-		printf("문화관\n");
-		break;
-
-	case 07:
-		printf("백마관\n");
-		break;
-
-
-		 case 11:
-			   printf("진리관\n");
-			   break;
-
-		   case 12:
-			   printf("조만식기념관\n");
-			   break;
-
-		   case 20:
-			   printf("미래관\n");
-			   break;
-
-		   case 21:
-			   printf("정보과학관\n");
-			   break;
-
-		   default:
-			   printf("해당하는 건물이름이 없습니다.");
-			   break;
-}
-
-
-	return 0;
-}
+#pragma warning (disable:4996)
+#include<stdio.h>
+#include<string.h>
+#include<stdlib.h>
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
+
+void BuildingSave(TimeTable info[N], int ok) {  //print ���� ����... ���� �����̶�� ����...
+	
+	//test :: strcpy(info[0].RoomNum, "21302");
+	//info[ok].UnivBuilding�� ����
+
+	int Building[N]; //int������ ȣ���� ������� ����
+	char SSU[N][10] = { "" };
+	int i, j;
+
+	char b_num[2];
+
+	for (i = 0; i < N; i++) {
+		for (j = 0; j < 2; j++)
+		{
+			b_num[j] = info[ok].RoomNum[j];
+		}
+		Building[i] = atoi(b_num); //b_num ���ڿ��� int������ ��ȯ�ؼ� ����
+
+		printf("��ȣ %d�� �ǹ� �̸� �Է� : ", Building[i]);
+		scanf("%s", SSU[i]);
+		break;
+	}
+
+	strcpy(info[ok].UnivBuilding, SSU[ok]);
+
+	//����ü�� ���� �����ؼ� ��� .. printf("%s", SSU[ok]);
+
+}
\ No newline at end of file
diff --git a/DaySearch.cPP b/DaySearch.cPP
deleted file mode 100644
index 991fba9..0000000
--- a/DaySearch.cPP
+++ /dev/null
@@ -1,50 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
-#pragma warning(disable:4996)
-//[DaySearch()] - ���Ϻ� �˻�
-
-//BuildingPrint(info, i); �� �� �� �ּ� ó��
-//SimpleRoomPrint(info, i); �� �� �� �ּ� ó��
-TimeTable info[N] = {
-
-	{ "�ڷᱸ��", "2150686201", "���ͼ�", "��", "0", "13:30 - 15:00" },
-{ "��ǻ�ͱ���", "2150686301", "����", "��", "0", "13:30 - 15:00" } };
-
-void DaySearch(TimeTable info[N]) {
-	char WhatDay[5];
-	char ExitDay[2];
-	
-	int i;
-
-	while (1) {
-
-		printf("���� �Է�(ex.��) : ");
-		scanf("%s", WhatDay);
-		if (!strcmp(WhatDay, "��") == 0 && !strcmp(WhatDay, "ȭ") == 0 && !strcmp(WhatDay, "��") == 0 && !strcmp(WhatDay, "��") == 0 && !strcmp(WhatDay, "��") == 0 && !strcmp(WhatDay, "��") == 0 && !strcmp(WhatDay, "��") == 0)
-		{
-			printf("�߸� �Է��ϼ̽��ϴ�. �ٽ� �Է��Ͻʽÿ�.\n\n");
-			continue;
-		}
-
-		for (i = 0; i < N; i++) {
-
-			if (strcmp(WhatDay, "e") == 0) break;
-			else if (strcmp(WhatDay, info[i].DayOfWeek) == 0) {
-				printf("%d. %s %s %s %s %s\n", i + 1, info[i].SubjectName, info[i].SubjectNum, info[i].Prof, WhatDay, info[i].Time);
-
-			}
-
-		}
-
-		printf("�߰��Է��Ϸ��� �ƹ�Ű�� �Է�, �������� e �Է� :");
-		scanf("%s", ExitDay);
-		if (strcmp(ExitDay, "e") == 0) break;
-		printf("<�߰��� �Է��մϴ�>\n\n");
-	}
-
-}
-int main(void) {
-	DaySearch(info);
-	return 0;
-}
\ No newline at end of file
diff --git a/DaySearch.cpp b/DaySearch.cpp
new file mode 100644
index 0000000..49834a8
--- /dev/null
+++ b/DaySearch.cpp
@@ -0,0 +1,51 @@
+#include <stdio.h>
+#include <string.h>
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
+#pragma warning(disable:4996)
+
+extern int Input(TimeTable info[N]);
+extern void SubjectNameSearch(TimeTable info[N]);
+extern void SubjectNumSearch(TimeTable info[N]);
+extern void ProfSearch(TimeTable info[N]);
+extern void RoomNumSearch(TimeTable info[N]);
+extern void BuildingSave(TimeTable info[N], int ok);
+extern void SimpleRoomPrint(TimeTable info[N], int ok);
+extern int SearchList(TimeTable info[N]);
+//ㅅㅂ.. 왜 안되세요...
+
+void DaySearch(TimeTable info[N]) {
+	char WhatDay[5] = ""; 
+	char ExitDay[2] = "";
+	
+	int i, j;
+
+	for(j=0 ; j<N; j++ ){
+
+		printf("요일 입력(ex.수) : ");
+		scanf("%s", WhatDay);
+		getchar();
+
+		if (!strcmp(WhatDay, "월") == 0 && !strcmp(WhatDay, "화") == 0 && !strcmp(WhatDay, "수") == 0 && !strcmp(WhatDay, "목") == 0 && !strcmp(WhatDay, "금") == 0 && !strcmp(WhatDay, "토") == 0 && !strcmp(WhatDay, "일") == 0)
+		{
+			printf("잘못 입력하셨습니다. 다시 입력하십시오.\n\n");
+			continue;
+		}
+
+		for (i = 0; i < N; i++) {
+
+			
+			if (strcmp(WhatDay, "e") == 0) break;
+			else if (strcmp(WhatDay, info[i].DayOfWeek) == 0) {
+				printf("%d. %s / %s / %s / %s : %s / %s ", i + 1, info[i].SubjectName, info[i].SubjectNum, info[i].Prof, info[i].DayOfWeek, info[i].Time, info[i].UnivBuilding);
+				SimpleRoomPrint(info, i);
+			}
+
+		}
+
+		printf("추가입력하려면 아무키나 입력, 나가려면 e 입력 : ");
+		scanf("%s", ExitDay);
+		if (strcmp(ExitDay, "e") == 0) SearchList(info);
+		printf("<추가로 입력합니다>\n\n");
+	}
+
+}
diff --git a/Input.cpp b/Input.cpp
index ce584fa..dc313d9 100644
--- a/Input.cpp
+++ b/Input.cpp
@@ -1,57 +1,48 @@
 #include <stdio.h>
-#define N 20;
 #pragma warning (disable:4996)
-// #include"C:\Users\남시현\Desktop\새 폴더 (2)\ciai03.h"
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
 
 /*
-	최종 제출 전
-	Input 함수로 바꿀 때 
-	int Input(TimeTable *info[N])
-	으로 바꿔야함
+	test ��
+	����ȸ�μ���׽��� 2150322701 ���� ��ȭ 21203 16:30-18:20
+	��ü�������α׷��� 2150534103 ������ ȭ�� 21204 18:00-19:15
+	�ڷᱸ�� 2150533741 �ſ��� ���� 21201 15:00-16:15
+	�ڷᱸ�� 2160533740 ���ͼ� ���� 21201 12:00-13:15
 */
+extern void BuildingSave(TimeTable info[N], int ok);
+int Input(TimeTable info[N]) {
 
-typedef struct TimeTable {
-	char SubjectName[20];
-	char SubjectNum[10];
-	char Prof[10];
-	char DayOfWeek[5];
-	char RoomNum[5];
-	char Time[20];
-} TimeTable;
-
-int Input(TimeTable info[]);
-
-int main() {
-	TimeTable info[20];
-
-	int a;
-	a = Input(info);
+	int count = 0;
+	int *pcount;
+	pcount = &count;
 
-}
+	while (1) {
 
-int Input(TimeTable info[]) {
-	int count = 0;
-	int *pcount = &count;
+		printf("Subject Name: ");
+		scanf("%s", info[*pcount].SubjectName);
 
-	printf("과목명: ");
-	scanf("%s", info[count].SubjectName);
+		printf("Subject Number: ");
+		scanf("%s", info[*pcount].SubjectNum);
 
-	printf("과목번호: ");
-	scanf("%s", info[count].SubjectNum);
+		printf("Professor Name: ");
+		scanf("%s", info[*pcount].Prof);
 
-	printf("교수명: ");
-	scanf("%s", info[count].Prof);
+		printf("Day of Week: ");
+		scanf("%s", info[*pcount].DayOfWeek);
 
-	printf("요일: ");
-	scanf("%s", info[count].DayOfWeek);
+		printf("Room Number: ");
+		scanf("%s", info[*pcount].RoomNum);
 
-	printf("교실번호: ");
-	scanf("%s", info[count].RoomNum);
+		printf("Lecture Time:(ex.HH:MM-HH:MM) ");
+		scanf("%s", info[*pcount].Time);
 
-	printf("수업시간: ");
-	scanf("%s", info[count].Time);
+		BuildingSave(info, *pcount); //21 ó�� ���� ���� ������ ����Ǹ� �� ��...
 
-	(*pcount)++;
+		printf("===========================\n");
+		(*pcount)++;
+		break;
+	}
 
+	//(*pcount)++;
 	return 0;
-}
+}
\ No newline at end of file
diff --git a/Login.cpp b/Login.cpp
new file mode 100644
index 0000000..e964555
--- /dev/null
+++ b/Login.cpp
@@ -0,0 +1,69 @@
+#include <stdio.h>
+#include <string.h>
+#pragma warning (disable:4996)
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
+
+int Login(NewUser saved[N]) {
+
+	int i = 0;
+	int find = 0;
+	char UserID[N] = "";
+	char UserPW[N] = "";
+
+	while (1) {
+
+		printf("���̵� : ");
+		scanf("%s", UserID);
+
+		for (;; i++) {
+
+			if (strcmp(saved[i].ID, UserID) != 0) {
+				find = 0;
+
+				if (strcmp(saved[find].ID, UserID) != 0) {
+					printf("ID�� �������� �ʽ��ϴ�.\n");
+					printf("\n");
+					break;
+				}
+			
+			}
+			else {
+				find = i;
+
+				while (1) {
+
+					printf("��й�ȣ : ");
+					scanf("%s", UserPW);
+
+					if (strcmp(saved[find].PW, UserPW) == 0)
+					{
+						printf("��� ����\n");
+						return 0;
+					}
+					else
+						printf("��й�ȣ ����\n");
+						printf("\n");
+				}
+				break;
+			}
+
+		}
+
+	}
+	
+}
+/*
+int main() {
+
+	NewUser saved[N];
+	strcpy(saved[0].ID, "chocotofu");
+	strcpy(saved[0].PW, "dlwlrma516");
+	
+	int login = -1;
+
+	login = Login(saved);
+
+	return 0;
+}
+
+*/
\ No newline at end of file
diff --git a/Main.cpp b/Main.cpp
new file mode 100644
index 0000000..7c2276b
--- /dev/null
+++ b/Main.cpp
@@ -0,0 +1,88 @@
+#include<stdio.h>
+#include<string.h>
+#include<stdlib.h>
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
+#pragma warning(disable:4996)
+extern int Apply(NewUser saved[N]);
+extern int Login(NewUser saved[N]);
+extern int Menu(TimeTable info[N]);
+int ApplyCheck(NewUser saved[N], int *count);
+int LoginCheck(NewUser saved[N], int count);
+
+int main(void)
+{
+	NewUser saved[N];
+	TimeTable info[N];
+	while (1)
+	{
+		int count = 0;
+		int select = 0;
+		int apply = -1;
+		int login = -1;
+		int success = -1;
+
+
+		printf("1.ȸ������ �ϱ�\n");
+		printf("2.�α��� �ϱ�\n");
+		printf("3.�����ϱ�\n");
+		scanf("%d", &select);
+
+		if (select == 1)
+		{
+			
+			apply = Apply(saved);
+			
+			while (success == -1)
+				success = ApplyCheck(saved, &count);
+
+		}
+		else if (select == 2)
+		{
+			Login(saved);
+
+			while (success == -1)
+				success = LoginCheck(saved, count);
+			if (success == 0)
+				Menu(info);
+		}
+		else if (select == 3) {
+			printf("���α׷��� �����մϴ�.\n");
+			exit(-1);
+		}
+	}
+	getchar();
+	return 0;
+}
+int ApplyCheck(NewUser saved[N], int *count)
+{
+	char result[10];
+	printf("ȸ������ ������� �Է��ϼ��� (����/����): ");
+	scanf("%s", result);
+	if (!strcmp(result, "����"))
+	{
+		printf("ȸ������ ����\n");
+		*count++;
+		return 0;
+	}
+	else if (!strcmp(result, "����"))
+	{
+		printf("ȸ������ ����\n");
+		return -1;
+	}
+}
+int LoginCheck(NewUser saved[N], int count)
+{
+	char result[10];
+	printf("�α��� ������� �Է��ϼ��� (����/����): ");
+	scanf("%s", result);
+	if (!strcmp(result, "����"))
+	{
+		printf("===========================\n");
+		return 0;
+	}
+	else if (!strcmp(result, "����"))
+	{
+		printf("===========================\n");
+		return -1;
+	}
+}
diff --git a/Menu.cpp b/Menu.cpp
index 8d15624..46df345 100644
--- a/Menu.cpp
+++ b/Menu.cpp
@@ -1,40 +1,35 @@
 #include <stdio.h>
-#define N 20;
 #pragma warning (disable:4996)
-#include"C:\Users\������\Desktop\�� ���� (2)\ciai03.h"
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
 
-int Menu(TimeTable info[]);
-int Input(TimeTable info[]);
-int SearchList();
+extern int main(void);
+extern int Input(TimeTable info[N]);
+extern int SearchList(TimeTable info[N]);
 
+int Menu(TimeTable info[N]) {
 
-int main() {
-	TimeTable info[20];
-	Menu(info);
-	return 0;
-}
-
-int Menu(TimeTable info[]) {
 	int MenuChoice;
 
-	printf("1. �ð�ǥ ����\n");
-	printf("2. �ð�ǥ �˻�\n");
-	printf("3. ����\n");
-	printf("��ȣ ����: ");
+	while (1) {
+	printf("1. 시간표 저장\n");
+	printf("2. 시간표 검색\n");
+	printf("3. 종료\n");
+	printf("번호 선택: ");
 
 	scanf("%d", &MenuChoice);
 
-	while (1) {
 		if (MenuChoice == 1) {
 			Input(info);
+			
 		} else if(MenuChoice == 2) {
-			SearchList();
+			SearchList(info);
+
 		} else if(MenuChoice == 3) {
-			printf("�������� ���ư��ϴ�.\n");
+			printf("메인으로 돌아갑니다.\n");
 			printf("\n");
-			break;
+			main();
 		}
 	}
 
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/ProfSearch.cpp b/ProfSearch.cpp
index b9af03f..5c09341 100644
--- a/ProfSearch.cpp
+++ b/ProfSearch.cpp
@@ -1,56 +1,43 @@
-#include<stdio.h>
+#include<stdio.h> 
 #include<string.h>
-#include"C:\Users\sewon\Desktop\�� ����\ciai03.h"
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
+#pragma warning (disable:4996)
 
-//TimeTable info[N];
-//BuildingPrint(info,i);
-//SimpleRoomPrint(info,i);
-TimeTable info[N] = {
-	  {"�ڷᱸ��","215068620","���ͼ�","��","","13:30-14:45"},
-	  {"�ڷᱸ��","215068620","���ͼ�","��","","13:30-14:45"},
-	  {"���α׷���1","501023160","���ͼ�","ȭ","","10:00-11:50"},
-	  {"���α׷���1","501023160","���ͼ�","��","","10:00-11:50"} };
+extern void BuildingSave(TimeTable info[N], int ok);
+extern void SimpleRoomPrint(TimeTable info[N], int ok);
+extern int SearchList(TimeTable info[N]);
 
-void ProfSearch(TimeTable info[N]) {
-	int a, b, i, count = 0;
-	char end, WhoProf[10];
-	for (i = 0; i < N; i++) {
-		printf("������ �Է�:");
-		scanf("%s", &WhoProf);
-		getchar();
-		for (a = 0; a < N; a++) {
-			for (b = a + 1; b < N + 1; b++) {
-				if (strcmp(WhoProf, info[b - 1].Prof) == 0) {
-					if (strcmp(info[a].SubjectNum, info[b].SubjectNum) == 0) {
-						count++;
-						printf("%d. %s / %s %s %s %s /", count, info[a].SubjectName, info[b - 1].DayOfWeek, info[b - 1].Time, info[b].DayOfWeek, info[b].Time);
+ void ProfSearch(TimeTable info[N]) {
+	 int i, j;
+	 char end[5] = "";
+	 char WhoProf[10] = "";
 
-						//              BuildingPrint(info,i);
-						//              printf(" / ");
-						//              SimpleRoomPrint(info,i);
-						printf("\n");
-					}
-				}
-				/*else{
-					  printf("�߸� �Է��ϼ̽��ϴ�. �ٽ� �Է��Ͻʽÿ�.");
-					  break;}*/
-			}
-		}
-		printf("�߰��Է��Ϸ��� �ƹ� Ű�� �Է�(����), �������� e �Է�:\n");
-		scanf("%s", &end);
-		if (end != 'e') {
-			continue;
+	 for (j = 0; j < N; j++) {
+		 
+		 printf("교수명 입력:");
+		 scanf("%s", WhoProf); //ERROR) subjectnum이 두번 나오고 i+1 이 인덱스 기능을 제대로 못함
+		 getchar();
+
+		 for (i = 0; i < N; i++) {
+
+			 if (strcmp(WhoProf, "e") == 0) break;
+			 else if (strcmp(WhoProf, info[i].Prof) == 0) {
+				 printf("%d. %s / %s / %s / %s : %s / %s ", i + 1, info[i].SubjectName, info[i].SubjectNum, info[i].Prof, info[i].DayOfWeek, info[i].Time, info[i].UnivBuilding);
+				 SimpleRoomPrint(info, i);
+			 }
+
+		 }
+	if (i == 0) {
+		printf("잘못 입력하셨습니다. 다시 입력하십시오.");
 		}
-		else {
-			break;
+		printf("추가입력하려면 아무 키나 입력, 나가려면 e 입력:\n");
+		scanf("%s", end);
+		getchar();
+		 		if (strcmp(end,"e")!=0) {
+			 			continue;
+			
 		}
+				else SearchList(info);
+		
 	}
-
 }
-
-int main(void)
-{
-	ProfSearch(info);
-	getchar();
-	return 0;
-}
\ No newline at end of file
diff --git a/RoomNumSearch.cpp b/RoomNumSearch.cpp
index d897250..5b7de99 100644
--- a/RoomNumSearch.cpp
+++ b/RoomNumSearch.cpp
@@ -1,41 +1,21 @@
 //���� ��ȣ �˻� ���
 #include<stdio.h>
 #include<string.h>
-//#include "C:\Users\jonge\Desktop\ciai03.h"
-#pragma once
-#define N 20 //ȸ�� ���� �ο� ��, ���ڼ�, �ð�ǥ���� ���� �� ���� ���
-typedef struct NewUser {
-   char ID[N];
-   char PW[N];
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
+#pragma warning (disable:4996)
 
-} NewUser;
-typedef struct TimeTable {
-   char SubjectName[20];
-   char SubjectNum[20];
-   char Prof[10];
-   char DayOfWeek[5];
-   char RoomNum[6];
-   char Time[20]; //�Է� ���� ��, ���� ���� (ex. HH:MM - HH:MM)
-} TimeTable;
+extern int Input(TimeTable info[N]);
+extern void SubjectNameSearch(TimeTable info[N]);
+extern void SubjectNumSearch(TimeTable info[N]);
+extern void ProfSearch(TimeTable info[N]);
+extern void DaySearch(TimeTable info[N]);
+extern void BuildingSave(TimeTable info[N], int ok);
+extern void SimpleRoomPrint(TimeTable info[N], int ok);
 
-//BuildingPrint(info, i);
-//SimpleRoomPrint(info, i);
-
-void RoomNumSearch(TimeTable info[N]);
-
-int main(void) {
-	TimeTable info[N] = {
-		{"�ڷᱸ��", "2150686201", "���ͼ�", "��", "21302", "13:00-14:45"},
-	{"�ڷᱸ��", "2150685201", "���ͼ�", "��", "21302", "13:00-14:45"},
-	{"��ǻ�ͱ���", "2150686301", "�躴��", "��", "21302", "15:00-16:15"},
-	{"��ǻ�ͱ���", "2150686301", "�躴��", "��", "21302", "15:00-16:15"} };
-	RoomNumSearch(info);
-
-}
 
 void RoomNumSearch(TimeTable info[N]) {
 
-	printf("���ǹ�ȣ �Է�: ");
+	printf("���ǹ�ȣ �Է�: "); //�� �������� �Է��� ���� ����,,
 	char WhatRoom[6];
 	scanf("%s", WhatRoom);
 
@@ -47,17 +27,18 @@ void RoomNumSearch(TimeTable info[N]) {
 		
 		if (strcmp(WhatRoom, info[i].RoomNum) == 0) {
 			for (int j = 0, p = 0; j < N, p < N; j++, p++) {
-				printf("%d. %s / ", p + 1, info[j].SubjectName);
+				printf("%d. %s / %s / %s / ", p + 1, info[j].SubjectName, info[j].SubjectNum, info[j].Prof);
 				for (int k = 0; k < N; k++) {
 					if (strcmp(info[j].SubjectName, info[k].SubjectName) == 0)
-						printf("%s: %s ", info[k].DayOfWeek, info[k].Time);
+						printf("%s : %s ", info[k].DayOfWeek, info[k].Time);
 				}
 				if (strcmp(info[j].SubjectName, info[j + 1].SubjectName) == 0)
 					j++;
-				printf("/ ");
-				//BuildingPrint(info, i);
+				printf("/ %s", info[j].UnivBuilding);
+
+				
 				printf(" ");
-				//SimpleRoomPrint(info, i);
+				SimpleRoomPrint(info, j);
 				printf("\n");
 				
 				if (strcmp(WhatRoom, info[j + 1].RoomNum) != 0)
@@ -77,7 +58,7 @@ void RoomNumSearch(TimeTable info[N]) {
 		}
 
 		else {
-			printf("�߸� �Է��ϼ̽��ϴ�. �ٽ� �Է��Ͻʽÿ�.\n");
+			printf("�߸� �Է��ϼ̽��ϴ�. �ٽ� �Է��Ͻʽÿ�.\n\n");
 			RoomNumSearch(info);
 			break;
 		}
diff --git a/SearchList.cpp b/SearchList.cpp
index 0e5b8e9..9cfd60c 100644
--- a/SearchList.cpp
+++ b/SearchList.cpp
@@ -3,9 +3,21 @@
 #include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
 #pragma warning(disable:4996)
 
-void SearchList() {
+extern void SubjectNameSearch(TimeTable *info);
+extern void SubjectNumSearch(TimeTable info[N]);
+extern void ProfSearch(TimeTable info[N]);
+extern void DaySearch(TimeTable info[N]);
+extern void RoomNumSearch(TimeTable info[N]);
+extern int Menu(TimeTable info[N]);
+
+int SearchList(TimeTable info[N]) {
 
 	int ListChoice;
+	int count = 0;
+	int *pcount; //���� ������ info[count]�� �������Ѿ� ��
+	pcount = &count;
+
+	printf("===========================\n");
 
 	printf("1. ����� �˻�\n");
 	printf("2. �����ȣ �˻�\n");
@@ -17,26 +29,29 @@ void SearchList() {
 	while (1) {
 		printf("��ȣ���� : \n");
 		scanf("%d", &ListChoice);
-		/*if (ListChoice == 1)
-			//SubjectNameSearch(info);
+
+		printf("===========================\n");
+
+		if (ListChoice == 1)
+			SubjectNameSearch(info);
 		else if (ListChoice == 2)
-			//SubjectNumSearch(info);
+			SubjectNumSearch(info);
 		else if (ListChoice == 3)
-			//ProfSearch(info);
+			ProfSearch(info);
 		else if (ListChoice == 4)
 			DaySearch(info);
-		/*else if (ListChoice == 5)
-			//RoomNumSearch(info);
+		else if (ListChoice == 5)
+			RoomNumSearch(info); 
 		else if (ListChoice == 6)
+		{
 			printf("<�޴�>\n");
+			Menu(info);
+		}
 		else
 			printf("�߸� �Է��߽��ϴ�. �ٽ� �Է��ϼ���.\n");
-			*/
+			
 	}
-}
-int main(void){
-	SearchList();
-	return 0;
 
+	return (*pcount)++; //�긦 ��� �����..?
 
-}
\ No newline at end of file
+}
diff --git a/SimpleRoomPrint.cpp b/SimpleRoomPrint.cpp
new file mode 100644
index 0000000..58fef45
--- /dev/null
+++ b/SimpleRoomPrint.cpp
@@ -0,0 +1,18 @@
+#include <stdio.h>
+#include <stdlib.h>
+#pragma once
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
+
+void SimpleRoomPrint(TimeTable info[N], int ok) {
+
+	//test :: strcpy(info[0].RoomNum, "21302");
+
+	int SimpleRoom; //int������ ȣ���� ������� ����
+	char num[3]; //RoomNum�� �� ���ڸ��� �Է¹��� ���ڿ�
+	for (int i = 0; i < 3; i++) //RoomNum�� �� ���ڸ� num[]�� ����
+	{
+		num[i] = info[ok].RoomNum[i + 2];
+	}
+	SimpleRoom = atoi(num); //num ���ڿ��� int������ ��ȯ�ؼ� ����
+	printf("%dȣ\n", SimpleRoom); //SimpleRoom ���
+}
diff --git a/SubjectNameSearch.cpp b/SubjectNameSearch.cpp
new file mode 100644
index 0000000..0fef659
--- /dev/null
+++ b/SubjectNameSearch.cpp
@@ -0,0 +1,54 @@
+#include <stdio.h>
+#include <string.h>
+#pragma warning (disable:4996)
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
+
+extern void BuildingPrint(TimeTable info[N], int ok);
+extern void SimpleRoomPrint(TimeTable info[N], int ok);
+
+void SubjectNameSearch(TimeTable *info) {
+
+	char Lecture[20] = "";
+	//char addSub[10] = "";
+	//���� �̸��� ������ ���� �� �ȶ߰� ������ ���� ����
+	//�׸����� �ѹ��� �����Ϸ��ϸ� �ʱ�ȭ��...
+
+	int i;
+
+	for (i = 0; i < N; i++) {
+
+		printf("������� �Է��ϼ��� :  (�����Ϸ��� e, �ٸ� ������ �Է��Ͻ÷��� m�� �Է��ϼ���)\n");
+		scanf("%s", Lecture);
+
+		if (strcmp(Lecture, "e") == 0) {
+			break;
+		}
+		else if (strcmp(Lecture, info[i].SubjectName) == 0) {
+
+			
+
+				printf("%s / %s / %s / %s : %s / %s ", info[i].SubjectName, info[i].SubjectNum, info[i].Prof, info[i].DayOfWeek, info[i].Time, info[i].UnivBuilding);
+				SimpleRoomPrint(info, i);
+
+				getchar();
+
+			
+			/*printf("���� �˻��� �߰��� �Ͻðڽ��ϱ�?(Y/N)");
+			scanf("%s", addSub);
+
+			if (strcmp(addSub, "Y") == 0)
+				continue;
+			else break;
+			*/
+		}
+		else if (strcmp(Lecture, "m") == 0) {
+			continue;
+		}
+		else {
+			printf("������ �����, e, �Ǵ� m�� �Է��ϼ���\n");
+			continue;
+		}
+	}
+
+	getchar();
+}
diff --git a/SubjectNumSearch.cpp b/SubjectNumSearch.cpp
new file mode 100644
index 0000000..c7ee0b1
--- /dev/null
+++ b/SubjectNumSearch.cpp
@@ -0,0 +1,46 @@
+#include<stdio.h>
+#include<string.h>
+#pragma once
+#pragma warning (disable:4996)
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
+
+
+extern void BuildingPrint(TimeTable info[N], int ok);
+extern void SimpleRoomPrint(TimeTable info[N], int ok);
+//�Լ� �̰� �ΰ��� �ҷ��� �dz�?
+
+void SubjectNumSearch(TimeTable info[N]) {
+	
+	int i;
+	char LectureNum[20];
+
+	for (i = 0; i < N; i++) {
+
+		printf("�����ȣ�� �Է��ϼ��� :  (�����Ϸ��� e, �ٸ� ������ �Է��Ͻ÷��� m�� �Է��ϼ���)\n");
+		scanf("%s", LectureNum);
+
+		if (strcmp(LectureNum, "e") == 0) {
+			break;
+		}
+		else if (strcmp(LectureNum, info[i].SubjectNum) == 0) {
+
+
+			printf("%s / %s / %s / %s : %s / %s ", info[i].SubjectName, info[i].SubjectNum, info[i].Prof, info[i].DayOfWeek, info[i].Time, info[i].UnivBuilding);
+			SimpleRoomPrint(info, i);
+
+			getchar();
+			i = 0;
+			break;
+
+			//���Ŀ� ��ȣ�������� �ٷΰ��°� �ƴ϶� �˻��� ������ �߰��� �Է��Ͻðڽ��ϱ�? �̷��� ������ ������
+
+		}
+		else if (strcmp(LectureNum, "m") == 0) {
+			continue;
+		}
+		else {
+			printf("������ �����ȣ, e, �Ǵ� m�� �Է��ϼ���\n");
+			continue;
+		}
+	}
+}
\ No newline at end of file
diff --git a/ciai03.h b/ciai03.h
new file mode 100644
index 0000000..3fea803
--- /dev/null
+++ b/ciai03.h
@@ -0,0 +1,16 @@
+#pragma once
+#define N 30 //ȸ�� ���� �ο� ��, ���ڼ�, �ð�ǥ���� ���� �� ���� ���
+typedef struct NewUser {
+	char ID[N];
+	char PW[N];
+	char testPW[N];
+} NewUser;
+typedef struct TimeTable {
+	char SubjectName[20];
+	char SubjectNum[20];
+	char Prof[10];
+	char DayOfWeek[5];
+	char RoomNum[6];
+	char Time[20]; //�Է� ���� ��, ���� ���� (ex. HH:MM - HH:MM)
+	char UnivBuilding[N];
+} TimeTable;