Finished part 1 of basic reqs