Updates for basic functionality, 6/15/2014