Tracking changes from WIP

Almost working...