still have some issues, but getting there
Merge branch 'debuggingTastes'