Alex comments 2/12 up to database
Trivial comments addressed from 2/12 conversation