Adding in welcome page and some better messagin and whatnot