Second Draft after specs

After following the specs