Everything kind of a mess.

This commit should sought it out... git n00b here...