cleaning up bake logic and continued work on sponge-project