Started workin on improvements