* Expanded on the Author Strategy
* Played around with more lambda stuff (overdone a bit :-))
* Added some unit tests
* Put some completely useless unit tests on Ignore
* Added some TODO's
* Eliminated a TODO
* Refactored a bit