Finish this

changed some