seems to be working. Going to commit,push, and do more tests