initial import, this is work in progress
cleaning up things