Design changes...almost done!