Added some edits, have to finish adding Toast confirmations and polishes