First commit - project advanced, Encore and Extra done