dabbleing with fixes, still broken