Lot of fixes and DRYing the project.

There are still some code issues, but it's usable now!!
I'm happy friends, very happy.