more cleanups - even closer to actually working
Even closer