First functional version. Now for some analysis wrappers.