Lockdown

Originally #600, reopened to run tests vs travis.