Adding missing files from last commit and implementing Before and After callbacks for each feature. closes #16
