U1 Refactored & U2 Complete