Implementing and fixing fill gaps (still buggy)