Few more bugs to fix before running