made basic stuff work for now