UX Details + initial unit tests