Fixed some crucial bugs and now it's progressing smoothly?