a lot of small tweaks, got things working well, I am now going to jump into associations. In case I break things I am commiting now.