Sort of works, started revamping UI