Woops, forgot to commit more. Challenge done.