Added all functionality

Framework and functionality finished.
What is left is template population