Implimented some more of the auto complete