2nd commit, basic expectations. for the most part...