Alot of changes and I believe everyones code is merged from this point