Start adding more comments and tests