add modal wrapper classes -- still a mess.