worked a bit more. things are broken