First commit since first phase
First commit since first phase.. Changed the structure and added almost all functions..