New filler code. Works on small scale.