Main funcionality working!!! Release candidate 1