Good job, all these changes i'm very much looking forward too