started on better ui:P