Some work done to fully automate this
TYpo