Problems solved first commit