Fleshed out the requirements a bit more