lot of changes, nothing working yet