big changes, things working!