Major changes, now working