bunch of changes, nothing works yet