First two working, some colour added