Finished up basic requirements