diff --git a/Password_manager/Password_manager.vcxproj b/Password_manager/Password_manager.vcxproj
index 8107d52..1dc1207 100644
--- a/Password_manager/Password_manager.vcxproj
+++ b/Password_manager/Password_manager.vcxproj
@@ -133,6 +133,8 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="source\buffer.cpp" />
+    <ClCompile Include="source\func.cpp" />
     <ClCompile Include="source\win.cpp" />
     <ClCompile Include="source\cryptography.cpp" />
     <ClCompile Include="source\main.cpp" />
diff --git a/Password_manager/Password_manager.vcxproj.filters b/Password_manager/Password_manager.vcxproj.filters
index 35be496..0186117 100644
--- a/Password_manager/Password_manager.vcxproj.filters
+++ b/Password_manager/Password_manager.vcxproj.filters
@@ -24,6 +24,12 @@
     <ClCompile Include="source\cryptography.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="source\func.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="source\buffer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\win.h">
diff --git a/Password_manager/include/Buffer.h b/Password_manager/include/Buffer.h
index 75fc65b..59c6cde 100644
--- a/Password_manager/include/Buffer.h
+++ b/Password_manager/include/Buffer.h
@@ -1,49 +1,28 @@
 #pragma once
-
+#include <cstdint>
 
 class Buffer
 {
 public:
-	unsigned char* buffer = nullptr;
-	int taken = 0;
-	int size = 0;
-	Buffer(int size)
-	{
-		this->size = size;
-		this->buffer = new unsigned char[size];
-	}
+	uint8_t* buffer = nullptr;
+	size_t taken = 0;
+	size_t size = 0;
 
-	Buffer() {
-		size = 0;
-		buffer = nullptr;
-	}
+	Buffer(size_t size);
+	Buffer();
+	~Buffer();
+	bool resize(size_t new_size);
+	void add(uint8_t* data, size_t data_size);
 
-	~Buffer()
-	{
-		if (buffer)	delete[] buffer;
-	}
+	// Removes data from buffer without checking if it's in the buffer
+	void remove_fast(uint8_t* data, size_t data_size);
 
-	void resize(int new_size)
-	{
-		unsigned char* new_buffer = (unsigned char*)realloc(buffer, new_size);
-		if (!new_buffer)
-		{
-			printf_s("Error resizing buffer\n");
-			return;
-		}
+	void remove(size_t index, size_t data_size);
 
-		buffer = new_buffer;
-		size = new_size;
-	}
+	size_t find(uint8_t* data, size_t data_size);
 
-	void add(void* data, int data_size)
-	{
-		if (taken + data_size > size)
-		{
-			resize(size + data_size);
-		}
-		memcpy_s(buffer + taken, size - taken, data, data_size);
-		taken += data_size;
-	}
+	void remove(uint8_t* data, size_t data_size);
+
+	void clear() { taken = 0; }
 
 };
\ No newline at end of file
diff --git a/Password_manager/include/func.h b/Password_manager/include/func.h
index 69fda17..3cf863f 100644
--- a/Password_manager/include/func.h
+++ b/Password_manager/include/func.h
@@ -5,87 +5,31 @@
 
 struct Pass
 {
-	char label[20];
-	char password[20];
+	char label[21];
+	char password[21];
 
-	Pass()
-	{
-		memset(label, 0, 20);
-		memset(password, 0, 20);
-	};
+	Pass() = default;
 };
 
-bool find_password(Buffer* buff, char* label, char* password)
+enum class Args
 {
-	Pass* passwords = (Pass*)buff->buffer;
+	Get, // get password for label
+	Generate, // generate password for label
+	List, // list all labels
+	Delete, // delete password for label
+	Print_all_p, // print all passwords
+	Input, // input password for label
+	Error // error
+};
 
-	for (int i = 0; i < buff->taken / sizeof(Pass); i++)
-	{
-		if (!strcmp(passwords[i].label, label))
-		{
-			strcpy_s(password, 20, passwords[i].password);
-			return true;
-		}
-	}
-	return false;
-}
+Pass* find_password(Buffer* buff, char* label);
 
-void generate_password(char* password)
-{
-	srand(time(NULL));
-	char characters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789~!@#$%^&*()_-+={[}]|:;<,>.?";
-	for (int i = 0; i < 15; i++)
-	{
-		password[i] = characters[rand() % (sizeof(characters) - 1)];
-	}
-	password[15] = '\0';
-}
+void generate_password(char* password);
 
-bool save_buffer_to_file(Buffer* buffer)
-{
-	std::ofstream file("passwords.bin", std::ios::binary);
-	if (!file.is_open())
-	{
-		printf_s("Error saving file\n");
-		return false;
-	}
-	file.write((char*)buffer->buffer, buffer->taken);
-	file.close();
-	return true;
-}
+bool save_buffer_to_file(Buffer* buffer);
 
-bool load_buffer_from_file(Buffer* buffer)
-{
+bool load_buffer_from_file(Buffer* buffer);
 
-	std::ifstream file("passwords.bin", std::ios::binary);
-	if (!file.is_open()) return false;
+void print_usage();
 
-	file.seekg(0, std::ios::end);
-	buffer->resize(file.tellg());
-	file.seekg(0, std::ios::beg);
-	file.read((char*)buffer->buffer, buffer->size);
-
-	if (file)
-		buffer->taken = buffer->size;
-	else
-		buffer->taken = file.gcount();
-
-	file.close();
-	return true;
-}
-
-
-void print_usage()
-{
-	printf_s(" Usage:\n\n");
-	printf_s(" password_manager.exe [flags]\n\n");
-	printf_s(" Flags:\n\n");
-	printf_s(" -h\t\t\tprint this message WIP\n");
-	printf_s(" <label>\t\tget password of this label\n");
-	printf_s(" -g <label>\t\tgenerate or update password of this label WIP [update]\n");
-	printf_s(" -l\t\t\tlist all labels WIP\n");
-	printf_s(" -d <label>\t\tdelete password of this label WIP \n");
-	printf_s(" -c\t\t\tclear all passwords WIP\n");
-	printf_s(" -p\t\t\tprint all passwords WIP\n");
-
-}
\ No newline at end of file
+Args get_args(int argc, char** argv, char** label);
\ No newline at end of file
diff --git a/Password_manager/source/buffer.cpp b/Password_manager/source/buffer.cpp
new file mode 100644
index 0000000..573c1b1
--- /dev/null
+++ b/Password_manager/source/buffer.cpp
@@ -0,0 +1,86 @@
+#include "buffer.h"
+#include <iostream>
+
+Buffer::Buffer()
+{
+	buffer = nullptr;
+	size = 0;
+	taken = 0;
+}
+
+Buffer::Buffer(size_t size)
+{
+	this->size = size;
+	this->buffer = new uint8_t[size];
+}
+
+Buffer::~Buffer()
+{
+	if (buffer)	delete[] buffer;
+}
+
+bool Buffer::resize(size_t new_size)
+{
+	uint8_t* new_buffer = (uint8_t*)realloc(buffer, new_size);
+	if (!new_buffer)
+	{
+		printf_s("Error resizing buffer\n");
+		return false;
+	}
+	buffer = new_buffer;
+	size = new_size;
+	return true;
+}
+
+void Buffer::add(uint8_t* data, size_t data_size)
+{
+	if (taken + data_size > size)
+		if(!resize(size + data_size)) return;
+	
+	memcpy_s(buffer + taken, size - taken, data, data_size);
+	taken += data_size;
+}
+
+void Buffer::remove_fast(uint8_t* data, size_t data_size)
+{
+	int64_t index = data - buffer;
+	if (index < 0 || index > taken || index + data_size > taken)
+	{
+		printf_s("Error removing from buffer\n");
+		return;
+	}
+	memmove_s(buffer + index, size - index, buffer + index + data_size, taken - index - data_size);
+	taken -= data_size;
+}
+
+void Buffer::remove(size_t index, size_t data_size)
+{
+	if (index + data_size > taken)
+	{
+		printf_s("Error removing from buffer\n");
+		return;
+	}
+	memmove_s(buffer + index, size - index, buffer + index + data_size, taken - index - data_size);
+	taken -= data_size;
+}
+
+size_t Buffer::find(uint8_t* data, size_t data_size)
+{
+	for (size_t i = 0; i < taken; i++)
+		if (memcmp(buffer + i, data, data_size) == 0)
+			return i;
+	
+	return -1;
+}
+
+void Buffer::remove(uint8_t* data, size_t data_size)
+{
+	size_t index = find(data, data_size);
+	if (index == -1)
+	{
+		printf_s("Error removing from buffer\n");
+		return;
+	}
+	remove(index, data_size);
+}
+
diff --git a/Password_manager/source/cryptography.cpp b/Password_manager/source/cryptography.cpp
index 17dd455..868c330 100644
--- a/Password_manager/source/cryptography.cpp
+++ b/Password_manager/source/cryptography.cpp
@@ -34,7 +34,7 @@ bool Cryptography::encrypt(Buffer* plain, Buffer* encrypted)
 	if (!ctx) return handleErrors();
 	if (1 != EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key, iv)) return handleErrors();
 
-	if (1 != EVP_EncryptUpdate(ctx, encrypted->buffer, &encrypted->taken, plain->buffer, plain->taken)) return handleErrors();
+	if (1 != EVP_EncryptUpdate(ctx, encrypted->buffer, (int*)& encrypted->taken, plain->buffer, plain->taken)) return handleErrors();
 	int final_len;
 	if (1 != EVP_EncryptFinal_ex(ctx, encrypted->buffer + encrypted->taken, &final_len)) return handleErrors();
 	encrypted->taken += final_len;
@@ -54,7 +54,7 @@ bool Cryptography::decrypt(Buffer* encrypted, Buffer* decrypted)
 	if (!ctx) return handleErrors();
 	if (1 != EVP_DecryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key, iv)) return handleErrors();
 
-	if (1 != EVP_DecryptUpdate(ctx, decrypted->buffer, &decrypted->taken, encrypted->buffer, encrypted->taken)) return handleErrors();
+	if (1 != EVP_DecryptUpdate(ctx, decrypted->buffer, (int*) & decrypted->taken, encrypted->buffer, encrypted->taken)) return handleErrors();
 	int final_len;
 	if (1 != EVP_DecryptFinal_ex(ctx, decrypted->buffer + decrypted->taken, &final_len)) return handleErrors();
 	decrypted->taken += final_len;
diff --git a/Password_manager/source/func.cpp b/Password_manager/source/func.cpp
new file mode 100644
index 0000000..9bfdb47
--- /dev/null
+++ b/Password_manager/source/func.cpp
@@ -0,0 +1,121 @@
+#include "func.h"
+
+Pass* find_password(Buffer* buff, char* label)
+{
+	Pass* passwords = (Pass*)buff->buffer;
+
+	for (int i = 0; i < buff->taken / sizeof(Pass); i++)
+	{
+		if (!strcmp(passwords[i].label, label))
+		{
+			return &passwords[i];
+		}
+	}
+	return nullptr;
+}
+
+void generate_password(char* password)
+{
+	srand(time(NULL));
+	char characters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789~!@#$%^&*()_-+={[}]|:;<,>.?";
+	for (int i = 0; i < 15; i++)
+	{
+		password[i] = characters[rand() % (sizeof(characters) - 1)];
+	}
+	password[15] = '\0';
+}
+
+bool save_buffer_to_file(Buffer* buffer)
+{
+	std::ofstream file("passwords.bin", std::ios::binary);
+	if (!file.is_open())
+	{
+		printf_s("Error saving file\n");
+		return false;
+	}
+	file.write((char*)buffer->buffer, buffer->taken);
+	file.close();
+	return true;
+}
+
+bool load_buffer_from_file(Buffer* buffer)
+{
+
+	std::ifstream file("passwords.bin", std::ios::binary);
+	if (!file.is_open()) return false;
+
+	file.seekg(0, std::ios::end);
+	buffer->resize(file.tellg());
+	file.seekg(0, std::ios::beg);
+	file.read((char*)buffer->buffer, buffer->size);
+
+	if (file)
+		buffer->taken = buffer->size;
+	else
+		buffer->taken = file.gcount();
+
+	file.close();
+	return true;
+}
+
+
+void print_usage()
+{
+	printf_s(" Usage:\n\n");
+	printf_s(" password_manager.exe [flags]\n\n");
+	printf_s(" Note: <label> max len 20 char\n\n");
+	printf_s(" Flags:\n\n");
+	printf_s(" -h         \t print this message\n");
+	printf_s(" <label>    \t get password of this label\n");
+	printf_s(" -g <label> \t generate or update password of this label\n");
+	printf_s(" -d <label> \t delete password of this label\n");
+	printf_s(" -i <label> \t input password for this label max 20 char\n");
+	printf_s(" -l         \t list all labels\n");
+	printf_s(" -p         \t print all passwords\n");
+}
+
+Args get_args(int argc, char** argv, char** label) {
+	if (argc < 2)
+	{
+		print_usage();
+		return Args::Error;
+	}
+
+	if (!strcmp("-h", argv[1]))
+	{
+		print_usage();
+		return Args::Error;
+	}
+
+	if (!strcmp("-l", argv[1])) return Args::List;
+	if (!strcmp("-p", argv[1])) return Args::Print_all_p;
+
+	if (argc < 3)
+	{
+		*label = argv[1];
+		return Args::Get;	
+	}
+
+	*label = argv[2];
+
+	if (!strcmp("-g", argv[1]))
+	{
+		printf_s("Generating password for %s\n", argv[2]);
+		return Args::Generate;
+	}
+
+	if (!strcmp("-d", argv[1]))
+	{
+		printf_s("Deleting password for %s\n", argv[2]);
+		return Args::Delete;
+	}
+
+	if (!strcmp("-i", argv[1]))
+	{
+		printf_s("Input password for %s:\n", argv[2]);
+		return Args::Input;
+	}
+
+
+	return Args::Error;
+}
\ No newline at end of file
diff --git a/Password_manager/source/main.cpp b/Password_manager/source/main.cpp
index f79692f..d9d59f5 100644
--- a/Password_manager/source/main.cpp
+++ b/Password_manager/source/main.cpp
@@ -7,28 +7,15 @@
 
 int main(int argc, char** argv)
 {
+	char* label = nullptr;
+	Args args = get_args(argc, argv, &label);
+	if(args == Args::Error) return 1;
 
-	bool generate = false;
-	if (argc < 2)
-	{
-		print_usage();
-		return 1;
-	}
 
-	if (!strcmp("-g", argv[1]))
-	{
-		if (argc < 3)
-		{
-			print_usage();
-			return 1;
-		}
-		printf_s("Generating password for %s\n", argv[2]);
-		generate = true;
-	}
 
 	Buffer encrypted_buffer;
 	if (!load_buffer_from_file(&encrypted_buffer))
-		if (!generate) {
+		if (!(args == Args::Generate)) {
 			printf_s("No passwords, try generating password\n");
 			return 1;
 		}
@@ -50,23 +37,131 @@ int main(int argc, char** argv)
 		if (!crypto.decrypt(&encrypted_buffer, &decrypted_buffer)) return 1;
 
 
-	Pass pass;
-	if (generate)
+	Pass* pass = nullptr;
+	Pass new_pass = { 0 };
+	Pass* passwords = nullptr;
+	std::string new_string;
+
+	
+	switch (args)
 	{
-		generate_password(pass.password);
-		strcpy_s(pass.label, 20, argv[2]);
-		decrypted_buffer.add(&pass, sizeof(Pass));
-		crypto.encrypt(&decrypted_buffer, &encrypted_buffer);
-		save_buffer_to_file(&encrypted_buffer);
-	}
-	else
-	{
-		if (!find_password(&decrypted_buffer, argv[1], pass.password))
+	case Args::Get:
+
+		pass = find_password(&decrypted_buffer, label);
+		if (!pass)
 		{
 			printf_s("Password not found\n");
 			return 1;
 		}
+		break;
+	case Args::Generate:
+
+		pass = find_password(&decrypted_buffer, label);
+
+		if (pass != nullptr) generate_password(pass->password);
+		else 
+		{
+			generate_password(new_pass.password);
+			strcpy_s(new_pass.label, 20, label);
+			decrypted_buffer.add((uint8_t*) & new_pass, sizeof(Pass));
+			pass = &new_pass;
+		}
+
+		crypto.encrypt(&decrypted_buffer, &encrypted_buffer);
+		save_buffer_to_file(&encrypted_buffer);
+		
+		break;
+	case Args::List:
+
+		passwords = (Pass*)decrypted_buffer.buffer;
+		for (int i = 0; i < decrypted_buffer.taken / sizeof(Pass); i++)
+		{
+			printf_s("%s\n", passwords[i].label);
+		}
+		return 0;
+	
+		break;
+	case Args::Delete:
+		pass = find_password(&decrypted_buffer, label);
+
+		if (!pass)
+		{
+			printf_s("Password not found\n");
+			return 1;
+		}
+		else
+		{
+			decrypted_buffer.remove_fast((uint8_t*)pass, sizeof(Pass));
+
+		}
+		crypto.encrypt(&decrypted_buffer, &encrypted_buffer);
+
+		save_buffer_to_file(&encrypted_buffer);
+
+		printf_s("Password deleted\n");
+
+		return 0;
+		break;
+	case Args::Print_all_p: 
+
+		printf_s("input main password for confirmation:");
+
+		new_string = get_passwd();
+		if (new_string.empty())
+		{
+			printf_s("Error getting password\n");
+			return 1;
+		}
+
+		if (new_string != user_pass)
+		{
+			printf_s("Wrong password\n");
+			return 1;
+		}
+
+		passwords = (Pass*)decrypted_buffer.buffer;
+		for (int i = 0; i < decrypted_buffer.taken / sizeof(Pass); i++)
+		{
+			printf_s("%s: %s\n", passwords[i].label, passwords[i].password);
+		}
+		return 0;
+
+	break;
+
+	case Args::Input:
+		new_string = get_passwd();
+		if (new_string.empty())
+		{
+			printf_s("Error getting password\n");
+			return 1;
+		}
+
+		pass = find_password(&decrypted_buffer, label);
+
+		if (pass != nullptr)
+		{
+			strcpy_s(pass->password, 20, new_string.c_str());
+		}
+		else
+		{
+			strcpy_s(new_pass.password, 20, new_string.c_str());
+			strcpy_s(new_pass.label, 20, label);
+			decrypted_buffer.add((uint8_t*)&new_pass, sizeof(Pass));
+			pass = &new_pass;
+		}
+
+		crypto.encrypt(&decrypted_buffer, &encrypted_buffer);
+		save_buffer_to_file(&encrypted_buffer);
+		break;
 	}
+
+
+#ifdef _DEBUG
+	printf_s("Password: %s", pass->password);
+#else
 	printf_s("Password copied to clipboard\n");
-	put_data_on_clipboard(pass.password);
+	put_data_on_clipboard(pass->password);
+#endif
+
+	
 }
diff --git a/Password_manager/source/win.cpp b/Password_manager/source/win.cpp
index c461bda..f34c628 100644
--- a/Password_manager/source/win.cpp
+++ b/Password_manager/source/win.cpp
@@ -4,7 +4,7 @@
 #include "win.h"
 
 bool put_data_on_clipboard(const char* text) {
-	int len = strlen(text);
+	size_t len = strlen(text);
 	if (strnlen_s(text, 20) == 0) {
 		printf_s("Text is empty\n");
 		return false;