ironing out functionality a bit