diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..df5f35d
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index cf5403e..154ddf7 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -12,7 +12,9 @@
     <inspection_tool class="EmptyDeclOrStmt" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="GrazieInspection" enabled="false" level="TYPO" enabled_by_default="false" />
     <inspection_tool class="LanguageDetectionInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="Misra" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="Misra" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="myMisraCPPChecks" value="clion-misra-cpp2008-*,-clion-misra-cpp2008-11-0-1" />
+    </inspection_tool>
     <inspection_tool class="OCUnusedGlobalDeclaration" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
       <option name="processCode" value="true" />
diff --git a/src/Autoarr/Autoarr2.cpp b/src/Autoarr/Autoarr2.cpp
new file mode 100644
index 0000000..edc431e
--- /dev/null
+++ b/src/Autoarr/Autoarr2.cpp
@@ -0,0 +1,40 @@
+#include "Autoarr2.hpp"
+
+//
+//
+//
+
+template<typename T>
+Autoarr2<T>::Autoarr2() {
+
+}
+
+template<typename T>
+T Autoarr2<T>::Get(uint32 index) {
+
+}
+
+template<typename T>
+T *Autoarr2<T>::GetPtr(uint32 index) {
+
+}
+
+template<typename T>
+void Autoarr2<T>::Set(uint32 index, T value) {
+
+}
+
+template<typename T>
+void Autoarr2<T>::Add(T value) {
+
+}
+
+template<typename T>
+Autoarr2<T>::~Autoarr2() {
+
+}
+
+template<typename T>
+uint32 Autoarr2<T>::Length() {
+
+}
diff --git a/src/Autoarr/Autoarr2.hpp b/src/Autoarr/Autoarr2.hpp
new file mode 100644
index 0000000..fcc469d
--- /dev/null
+++ b/src/Autoarr/Autoarr2.hpp
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "../base/base.h"
+
+template <typename T>
+class Autoarr2 {
+    uint16 blocks_count;
+    uint16 block_length;
+
+    T** values;
+public:
+    Autoarr2();
+    uint32 Length();
+    T Get(uint32 index);
+    T* GetPtr(uint32 index);
+    void Set(uint32 index, T value);
+    void Add(T value);
+    ~Autoarr2();
+};
diff --git a/src/Hashtable/Hashtable.h b/src/Hashtable/Hashtable.h
index 19eca90..6c550e2 100644
--- a/src/Hashtable/Hashtable.h
+++ b/src/Hashtable/Hashtable.h
@@ -4,7 +4,6 @@
 extern "C" {
 #endif
 
-#include "../base/base.h"
 #include "hash.h"
 #include "KeyValuePair.h"
 
diff --git a/src/Hashtable/Hashtable2.cpp b/src/Hashtable/Hashtable2.cpp
new file mode 100644
index 0000000..46631d4
--- /dev/null
+++ b/src/Hashtable/Hashtable2.cpp
@@ -0,0 +1,35 @@
+#include "Hashtable2.hpp"
+
+//
+//
+//
+
+template<typename TKey, typename TValue>
+Hashtable2<TKey, TValue>::Hashtable2() {
+
+}
+
+template<typename TKey, typename TValue>
+TValue Hashtable2<TKey, TValue>::Get(TKey key) {
+
+}
+
+template<typename TKey, typename TValue>
+TValue Hashtable2<TKey, TValue>::GetPtr(TKey key) {
+
+}
+
+template<typename TKey, typename TValue>
+bool Hashtable2<TKey, TValue>::AddOrSet(TKey key, TValue) {
+
+}
+
+template<typename TKey, typename TValue>
+bool Hashtable2<TKey, TValue>::Remove(TKey) {
+
+}
+
+template<typename TKey, typename TValue>
+Hashtable2<TKey, TValue>::~Hashtable2() {
+
+}
diff --git a/src/Hashtable/Hashtable2.hpp b/src/Hashtable/Hashtable2.hpp
new file mode 100644
index 0000000..a03af78
--- /dev/null
+++ b/src/Hashtable/Hashtable2.hpp
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "hash.h"
+#include "../Autoarr/Autoarr2.hpp"
+
+template <typename TKey, typename TValue>
+class Hashtable2{
+    uint8 hein;
+public:
+    Autoarr2<TKey>* Keys;
+    Autoarr2<TValue>* Values;
+
+    Hashtable2();
+    TValue Get(TKey key);
+    TValue GetPtr(TKey key);
+    bool AddOrSet(TKey key, TValue);
+    bool Remove(TKey);
+    ~Hashtable2();
+};
+
diff --git a/src/base/std.h b/src/base/std.h
index 87ad564..88aee49 100644
--- a/src/base/std.h
+++ b/src/base/std.h
@@ -51,7 +51,9 @@ extern "C" {
     #pragma GCC error "unknown compiler"
 #endif
 
-
+#ifndef NULL
+    #define NULL ((void*)0)
+#endif
 
 #if __cplusplus
 }