Huge code refactor. Code not full working now.
Fixing classes