Updated pretty much everything

This mostly adds the ability to add choices to the console.