more changes, but things are a mess, should spend more time doing design