Add more comments, starting to figure out where code will go