moved things around
fixed namespace - d'oh