working through feature stuff