Attempt to fix bugs. Bad commit, will not work.