LOTS of changes... looking good :)