Cleaned WD a bit, made it leaner, added templates