cleaned up file somewhat, still testing