K, then let's merge this and refactor from them on..:)