Now with all features of base challenge completed and working