A lot of updates... still working in progress...