Needs some work

More...