stuff
re-enabled stuff in packages branch