wtf
working again
more integration