Some more updates to design; continuing on laptop on way to home