first pass at better organization