Implement adding
Make master sufficiently different from experimental
Resolve .pyc merge conflicts