work in progress round 2. will have it done by tonight