Minor Changes, still not functional