start fixing this project up too