okay, this should basically be working now...