Cleaned up version

This version is the base for all future experiments.
Fixed external interface flaws