UI Working, now on logic