mixed bag of working and not working. commiting so i can work from elsewhere