Way cleaner; subspace layer works now!