Last scraps before I rewrite everything