Merge pull request #5 from saulelis/step2

_base cleanup
Merge pull request #6 from saulelis/step2

conflictz
Step1 768 almost completed
Merge pull request #7 from saulelis/step1

Step1 768 almost completed
Step1 768 minor adjustment
Step1 768 minor re-adjustment
Merge pull request #8 from saulelis/step1

Step1 768 minor adjustment
step2 320 halfway
Merge pull request #9 from saulelis/step22

step2 320 halfway
step2 done