got things basically working
got things basically working