Major update. I promise to commit more