Almost freezed the code. Final review left