got everything pretty much working