finished first two tabs

Done with criteria for now