Add some quick fixes but still not functional!