Filled in a few more sections