Fleshed out the Add command

Also added some extra conditionals to make sure the user is inputting
stuff correctly.