trying to cleanup the mess so I can debug a bit better