Ugly design changes from Tanja. Urgh

Signed-off-by: Thor Nahody <thor@nahody.com>