a few more annotations, going to get started working soon