Last commit before i leave for trikala.
I need to have the project in its current state.