Moved masks and activns into nn objects.Still broken from the change.