edkeld, almost done i guess