mostly working. just needs cleanup now