Committing some unfinished stuff so I can get easily from other pc.