Updated to the current state of the coding
Commit due to branch switch, WIP, not bug-free